diff --git a/assets/themes/onwheels/onwheels.json b/assets/themes/onwheels/onwheels.json
index 483ae4ee3..2994e849b 100644
--- a/assets/themes/onwheels/onwheels.json
+++ b/assets/themes/onwheels/onwheels.json
@@ -32,11 +32,6 @@
     "walls_and_buildings"
   ],
   "overrideAll": {
-<<<<<<< HEAD
-    "minZoom": "15",
-    "mapRendering": [
-      {
-=======
     "+calculatedTags": [
       "_poi_walls_and_buildings_entrance_properties=feat.closestn('walls_and_buildings', 1, undefined, 1000).map(w => ({id: w.feat.properties.id, width: w.feat.properties['_entrance:width']}))[0]",
       "_poi_entrance:width=JSON.parse(feat.properties._poi_walls_and_buildings_entrance_properties)?.width"
@@ -68,7 +63,6 @@
     "minzoom": "15",
     "mapRendering": [
       {
->>>>>>> develop
         "label": null
       }
     ]