diff --git a/main.json b/main.json
index d7ee584..372e30d 100644
--- a/main.json
+++ b/main.json
@@ -14,7 +14,7 @@
          "id":38,
          "image":"imgs\/heic1806b_2.jpg",
          "name":"background",
-         "offsetx":-293.333333333333,
+         "offsetx":-293.333,
          "offsety":-548,
          "opacity":1,
          "type":"imagelayer",
@@ -44,11 +44,7 @@
                 {
                  "name":"exitUrl",
                  "type":"string",
-<<<<<<< HEAD
                  "value":"{lobby.maps.at.rc3.world\/maps\/erfas-south.json#start_ccc-darmstadt}"
-=======
-                 "value":"{<lobby>\/maps\/erfas-south.json#start_ccc-darmstadt}"
->>>>>>> cfdbe5bc8e1a751fd6ca767ce27ece6aec769db1
                 }],
          "type":"tilelayer",
          "visible":true,
@@ -353,7 +349,7 @@
  "nextobjectid":1,
  "orientation":"orthogonal",
  "renderorder":"right-down",
- "tiledversion":"1.4.3",
+ "tiledversion":"1.4.2",
  "tileheight":32,
  "tilesets":[
         {
diff --git a/w17.tmx b/w17.tmx
index 3162984..8cbaefe 100644
--- a/w17.tmx
+++ b/w17.tmx
@@ -1338,11 +1338,7 @@
  </layer>
  <layer id="40" name="exit" width="51" height="40">
   <properties>
-<<<<<<< HEAD
    <property name="exitUrl" value="{lobby.maps.at.rc3.world/maps/erfas-south.json#start_ccc-darmstadt}"/>
-=======
-   <property name="exitUrl" value="{&lt;lobby&gt;/maps/erfas-south.json#start_ccc-darmstadt}"/>
->>>>>>> cfdbe5bc8e1a751fd6ca767ce27ece6aec769db1
   </properties>
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,