diff --git a/app/tests.py b/app/tests.py
index 996e11b34586f6b0964d807c2c4ef244ec6cb4fe..0be875fa0d45c821bcf3614e74c05cd61472ec1c 100644
--- a/app/tests.py
+++ b/app/tests.py
@@ -1355,7 +1355,6 @@ class RevisiMateriTest(TestCase):
         self.assertEqual(response.status_code, 200)
         # Logout
         self.client.logout()
-<<<<<<< HEAD
     
 class NameBannerFunctionalTest(LiveServerTestCase):
     selenium = None
@@ -1389,7 +1388,6 @@ class NameBannerFunctionalTest(LiveServerTestCase):
 
 
 
-=======
 
 
 class GenerateDummyCommandTest(TestCase):
@@ -2109,4 +2107,3 @@ class MateriModelTest(TestCase):
 
         Like.objects.create(timestamp=datetime.now(), materi=self.materi, session_id="dummysessionid2")
         self.assertEqual(2, self.materi.like_count)
->>>>>>> 0a815a6d87c62d6e1ba35f5645c26ce81ef2dfdb