diff --git a/code/world.dm b/code/world.dm
index da1d22b788e..bfc8af30528 100644
--- a/code/world.dm
+++ b/code/world.dm
@@ -17,13 +17,8 @@
 	hub_password = "kMZy3U5jJHSiBQjr"
 	name = "/tg/ Station 13"
 	fps = 20
-<<<<<<< HEAD
-	cache_lifespan = 0 // SKYRAT EDIT - Makes sure TTS shit isnt kept past rounds
-	//map_format = SIDE_MAP // SKYRAT EDIT - TODO: WALLENING - REMOVE THIS (hopefully the visual z-fighting issues will have been ironed out by then)
-=======
 	cache_lifespan = 0
-	map_format = SIDE_MAP
->>>>>>> 64b5f4d0fff (Sets cache lifespan to 0 (#83316))
+	//map_format = SIDE_MAP // SKYRAT EDIT - TODO: WALLENING - REMOVE THIS (hopefully the visual z-fighting issues will have been ironed out by then
 #ifdef FIND_REF_NO_CHECK_TICK
 	loop_checks = FALSE
 #endif