diff --git a/shared/tests.py b/shared/tests.py
index ee1664951..99467ca97 100644
--- a/shared/tests.py
+++ b/shared/tests.py
@@ -1,15 +1,5 @@
 from django.test import TestCase
 from shared.test_utilities import mock_user_login, RequestMock
-<<<<<<< HEAD
-=======
-
->>>>>>> 8e0972ecb0cb613b6bf9a96425fc017e5fe918e7
-from unittest.mock import MagicMock
-
-class TestMockUserLogin(TestCase):
-    def test_mock_user_login(self):
-        user = mock_user_login()
-        self.assertEqual(user.openstaxuserprofile.openstax_accounts_uuid, '467cea6c-8159-40b1-90f1-e9b0dc26344c')
 
 
 class TestMockRequest(TestCase):