diff --git a/api.py b/api.py
index a9ec753..504ecb2 100644
--- a/api.py
+++ b/api.py
@@ -3,10 +3,7 @@ from models import User, Achievement
 
 import json
 from graphviz import Digraph
-<<<<<<< HEAD
 from flask import escape
-=======
->>>>>>> 4ad2b75835745d3a91007abab4741f5956ba9cbd
 
 @app.route("/api")
 @app.route("/api/all")