diff --git a/tests/integration/client/test_runner.py b/tests/integration/client/test_runner.py
index 60534ddf6a..da95a8365d 100644
--- a/tests/integration/client/test_runner.py
+++ b/tests/integration/client/test_runner.py
@@ -133,8 +133,6 @@ class RunnerModuleTest(TestCase, AdaptedConfigurationTestCaseMixin):
                 'quuz': 'on',
             },
         })
-<<<<<<< HEAD:tests/integration/client/test_runner.py
-=======
 
     def test_invalid_kwargs_are_ignored(self):
         low = {