diff --git a/backend/scopeBackend/views.py b/backend/scopeBackend/views.py
index 8d443fa..94c715d 100644
--- a/backend/scopeBackend/views.py
+++ b/backend/scopeBackend/views.py
@@ -557,7 +557,3 @@ def create(self, request):
         serializer.save(workspace=workspace, original_response=original_response)
         headers = self.get_success_headers(serializer.data)
         return Response(serializer.data, status=status.HTTP_200_OK)
-<<<<<<< HEAD
->>>>>>> 4bd4c5f16e01eaa11e64c9a5faad8d8a11ac19e9
-=======
->>>>>>> 4bd4c5f16e01eaa11e64c9a5faad8d8a11ac19e9