diff --git a/app.py b/app.py
index 23b878a..c36232f 100755
--- a/app.py
+++ b/app.py
@@ -157,8 +157,4 @@ def dcard_dev():
 
 
 if __name__ == "__main__":
-<<<<<<< HEAD
     app.run(debug=False, port=4980, host='0.0.0.0', threaded=True)
-=======
-    app.run(debug=False, port=4998, host='0.0.0.0', threaded=True)
->>>>>>> dev/addPush