diff --git a/code/__defines/map.dm b/code/__defines/map.dm
index 8b7b933db5..45955c4df8 100644
--- a/code/__defines/map.dm
+++ b/code/__defines/map.dm
@@ -7,17 +7,9 @@
 #define MAP_LEVEL_EMPTY			0x020 // Empty Z-levels that may be used for various things (currently used by bluespace jump)
 #define MAP_LEVEL_CONSOLES		0x040 // Z-levels available to various consoles, such as the crew monitor (when that gets coded in). Defaults to station_levels if unset.
 #define MAP_LEVEL_XENOARCH_EXEMPT 0x080	// Z-levels exempt from xenoarch digsite generation.
-<<<<<<< HEAD
 #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 SSpersistence should persist between rounds //CHOMPedit bumped to 0x400, somethingsomething don't break
-||||||| parent of 61dfa77962... Merge pull request #10637 from VOREStation/upstream-merge-8097
-#define MAP_LEVEL_PERSIST       0x100   // Z-levels where SSpersistence should persist between rounds
-#define MAP_LEVEL_MAPPABLE       0x200   // Z-levels where SSpersistence should persist between rounds
-=======
-#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
->>>>>>> 61dfa77962... Merge pull request #10637 from VOREStation/upstream-merge-8097
+#define MAP_LEVEL_MAPPABLE       0x400   // Z-levels where mapping units will work fully //CHOMPedit bumped to 0x400, somethingsomething don't 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