diff --git a/code/__defines/map.dm b/code/__defines/map.dm
index 141f397e56..a98ff378ba 100644
--- a/code/__defines/map.dm
+++ b/code/__defines/map.dm
@@ -11,11 +11,7 @@
 #define MAP_LEVEL_VORESPAWN		0x100	//CHOMPedit Z-levels players are allowed to late join to via vorish means. Usually non-dangerous locations.
 #define MAP_LEVEL_PERSIST       0x200   // Z-levels where SSpersistence should persist between rounds //CHOMPedit bumped to 0x200 because vorespawn, hopefully this doesn't break things
 #define MAP_LEVEL_MAPPABLE       0x400   // Z-levels where mapping units will work fully //CHOMPedit bumped to 0x400, somethingsomething don't break
-=======
-#define MAP_LEVEL_PERSIST       0x100   // Z-levels where SSpersistence should persist between rounds
-#define MAP_LEVEL_MAPPABLE       0x200   // Z-levels where mapping units will work fully
-#define MAP_LEVEL_BELOW_BLOCKED   0x400   // Z-levels in multiz with level below not meant to be 'normally' accessible
->>>>>>> d8b0ebf7b4e... Merge pull request #12208 from Heroman3003/tether-passage-block
+#define MAP_LEVEL_BELOW_BLOCKED   0x800   // Z-levels in multiz with level below not meant to be 'normally' accessible //CHOMPedit bumped to 0x800, please god do not break
 
 // Misc map defines.
 #define SUBMAP_MAP_EDGE_PAD 8 // Automatically created submaps are forbidden from being this close to the main map's edge.	//VOREStation Edit