diff --git a/code/controllers/subsystems/ticker.dm b/code/controllers/subsystems/ticker.dm
index 0c626ec041b..20be2138c1b 100644
--- a/code/controllers/subsystems/ticker.dm
+++ b/code/controllers/subsystems/ticker.dm
@@ -183,11 +183,14 @@ var/global/datum/controller/subsystem/ticker/ticker
 	if(adm["total"] == 0)
 		send2adminirc("A round has started with no admins online.")
 
+<<<<<<< HEAD
 /*	supply_controller.process() 		//Start the supply shuttle regenerating points -- TLE // handled in scheduler
 	master_controller.process()		//Start master_controller.process()
 	lighting_controller.process()	//Start processing DynamicAreaLighting updates
 	*/
 
+=======
+>>>>>>> 6cb0471... Merge pull request #7917 from MistakeNot4892/psched
 	current_state = GAME_STATE_PLAYING
 	Master.SetRunLevel(RUNLEVEL_GAME)
 
diff --git a/code/game/world.dm b/code/game/world.dm
index 5c5eaff9e5f..7c05a28ddd7 100644
--- a/code/game/world.dm
+++ b/code/game/world.dm
@@ -57,12 +57,17 @@
 	// Create robolimbs for chargen.
 	populate_robolimb_list()
 
+<<<<<<< HEAD
 	//Must be done now, otherwise ZAS zones and lighting overlays need to be recreated.
 	//createRandomZlevel()	//VOREStation Removal: Deprecated
 
 	master_controller = new /datum/controller/game_controller()
 
 	Master.Initialize(10, FALSE, TRUE)
+=======
+	master_controller = new /datum/controller/game_controller()
+	Master.Initialize(10, FALSE)
+>>>>>>> 6cb0471... Merge pull request #7917 from MistakeNot4892/psched
 
 	spawn(1)
 		master_controller.setup()
@@ -408,7 +413,10 @@ var/world_topic_spam_protect_time = world.timeofday
 			to_world("<span class='boldannounce'>Rebooting world immediately due to host request</span>")
 	else
 		Master.Shutdown()	//run SS shutdowns
+<<<<<<< HEAD
 		//processScheduler.stop() //VOREStation Removal
+=======
+>>>>>>> 6cb0471... Merge pull request #7917 from MistakeNot4892/psched
 		for(var/client/C in GLOB.clients)
 			if(config.server)	//if you set a server location in config.txt, it sends you there instead of trying to reconnect to the same world address. -- NeoFite
 				C << link("byond://[config.server]")