diff --git a/tests/test_gis_identify.py b/tests/test_gis_identify.py
index 1d62f7c0df27e95ed7068fa773ce1b7284ae7122..93c5866826ec0883c4eabd388f1ec5a4e3de6d00 100644
--- a/tests/test_gis_identify.py
+++ b/tests/test_gis_identify.py
@@ -4542,10 +4542,6 @@ class TestGisIdentify:
     # *************************************************************************
     # *************************************************************************
     
-<<<<<<< HEAD
-#******************************************************************************
-#******************************************************************************
-=======
     def test_finding_roundabouts(self):
         
         # network should be a OSM-nx formatted graph