diff --git a/sunraster/_dev/scm_version.py b/sunraster/_dev/scm_version.py
index bb90eb05..77e3cb1b 100644
--- a/sunraster/_dev/scm_version.py
+++ b/sunraster/_dev/scm_version.py
@@ -5,11 +5,7 @@
 try:
     from setuptools_scm import get_version
 
-<<<<<<<
-    version = get_version(root=os.path.join("..", ".."), relative_to=__file__)
-=======
     version = get_version(root=Path('../..'), relative_to=__file__)
->>>>>>>
 except ImportError:
     raise
 except Exception as e: