diff --git a/project_server.py b/project_server.py
index 2ef2fd9a3b3f7868fd94f5f9478f7193fbf5209e..b1c6bb5c1e4668d8d99623e01297dc07394c4df5 100644
--- a/project_server.py
+++ b/project_server.py
@@ -28,8 +28,6 @@ def returnManageCoworkingSpaces():
     if (request.method == 'GET'):
         return render_template("Manage_Coworking_Spaces.html")
 
-<<<<<<< Updated upstream
-=======
 @app.route("/ListLocations", methods=['GET'])
 def returnListLocations():
     if (request.method =='GET'):
@@ -72,8 +70,6 @@ def Load():
 			return render_template('Space.html', data = data)
 			# pageAddress = Address, pageMain_Photo = Main_Photo, pageAdditional_photos = Additional_photos, pageDescription = Description, pageWebsite = Website, pageOpening_Hours = Opening_Hours  )
 
-
->>>>>>> Stashed changes
 @app.route("/SearchRecord", methods=['POST', 'GET'])
 def searchRecord():