diff --git a/dimensions/overworld.json b/dimensions/overworld.json
index a72f2446..f78fd8b6 100644
--- a/dimensions/overworld.json
+++ b/dimensions/overworld.json
@@ -57,11 +57,7 @@
             }
         }
     },
-<<<<<<< Updated upstream
-    "regionZoom": 8.15,
-=======
     "regionZoom": 16.15,
->>>>>>> Stashed changes
     "regions": [
         "frozen",
         "hot",
@@ -588,17 +584,5 @@
     "stronghold": "stronghold",
     "strongholdJumpDistance": 670,
     "maxStrongholds": 27,
-<<<<<<< Updated upstream
-    "decorate": true,
-    "loot": {
-        "mode": "ADD",
-        "tables": [
-            "global-clutter",
-            "global-tools",
-            "global-treasure"
-        ]
-    }
-=======
     "decorate": true
->>>>>>> Stashed changes
 }
\ No newline at end of file