diff --git a/__pycache__/main.cpython-310.pyc b/__pycache__/main.cpython-310.pyc
index fe5d448..2a5171d 100644
Binary files a/__pycache__/main.cpython-310.pyc and b/__pycache__/main.cpython-310.pyc differ
diff --git a/main.py b/main.py
index 974e624..2372afa 100644
--- a/main.py
+++ b/main.py
@@ -129,8 +129,4 @@ api.add_resource(jobManager, '/api/jobs')
 
 #Runs the Flask app
 if __name__ == '__main__':
-<<<<<<< HEAD
-    app.run(debug=True)
-=======
     app.run(debug=False)
->>>>>>> a21c4bf53294a9d71093572e3e30f1010607e015