diff --git a/testing.py b/testing.py
index e342598..7a8a52b 100644
--- a/testing.py
+++ b/testing.py
@@ -22,13 +22,10 @@ loginPath = base_url + "/api/login"
 addProjectPath = base_url + "/api/project"
 submitReportPath = base_url + "/api/submitReport"
 getWeeklyReportPath = base_url + "/api/getWeeklyReport"
-<<<<<<< HEAD
 getProjectPath = base_url + "/api/project"
-=======
 signReportPath = base_url + "/api/signReport"
 addUserToProjectPath = base_url + "/api/addUserToProject"
 promoteToAdminPath = base_url + "/api/promoteToAdmin"
->>>>>>> 9ad89d60636ac6091d71b0bf307982becc9b89fe
 
 
 # Posts the username and password to the register endpoint
@@ -232,9 +229,6 @@ if __name__ == "__main__":
     test_add_project()
     test_submit_report()
     test_get_weekly_report()
-<<<<<<< HEAD
     test_get_project()
-=======
     test_sign_report()
     test_add_user_to_project()
->>>>>>> 9ad89d60636ac6091d71b0bf307982becc9b89fe