diff --git a/elements/opensuse/bin/map-services b/elements/opensuse/bin/map-services
index ee1cd96c6..4a2e908ae 100755
--- a/elements/opensuse/bin/map-services
+++ b/elements/opensuse/bin/map-services
@@ -23,7 +23,6 @@ import sys
 # distromatch or other rich data sources.
 # Debian name on the left, openSUSE on the right.
 service_map = {
-<<<<<<< HEAD
     # openstack mapping
     'cinder-api': 'openstack-cinder-api',
     'cinder-scheduler': 'openstack-cinder-scheduler',