diff --git a/tests/lib/pysol_tests/game_drag.py b/tests/lib/pysol_tests/game_drag.py
index c59ce23d..a5a833b9 100644
--- a/tests/lib/pysol_tests/game_drag.py
+++ b/tests/lib/pysol_tests/game_drag.py
@@ -2,11 +2,7 @@
 
 import unittest
 
-<<<<<<< HEAD
 from pysollib.game import GameDrag, GameStacks
-=======
-from pysollib.game import GameDrag
->>>>>>> f3d3517... add missing attribute.
 
 
 class MyTests(unittest.TestCase):
@@ -14,12 +10,9 @@ class MyTests(unittest.TestCase):
         d = GameDrag()
         d.shadows.append("test")
         self.assertTrue(len(d.shadows))
-<<<<<<< HEAD
 
     def test_addattr(self):
         s = GameStacks()
         s.addattr(tableaux=[])
         s.tableaux.append("myval")
         self.assertEqual(s.tableaux, ["myval"])
-=======
->>>>>>> f3d3517... add missing attribute.