diff --git a/tests/routes/workspaces/test_projects.py b/tests/routes/workspaces/test_projects.py
index 7d8f5ae7..a442e9fb 100644
--- a/tests/routes/workspaces/test_projects.py
+++ b/tests/routes/workspaces/test_projects.py
@@ -1,6 +1,5 @@
 from flask import url_for
 
-<<<<<<< HEAD
 from tests.factories import (
     UserFactory,
     WorkspaceFactory,
@@ -9,9 +8,7 @@ from tests.factories import (
     EnvironmentFactory,
     ProjectFactory,
 )
-=======
-from tests.factories import UserFactory, WorkspaceFactory, WorkspaceRoleFactory
->>>>>>> Add tests
+
 from atst.domain.projects import Projects
 from atst.domain.workspaces import Workspaces
 from atst.domain.roles import Roles