diff --git a/code/controllers/subsystems/ticker.dm b/code/controllers/subsystems/ticker.dm
index 55936c65b0..447fb6c773 100644
--- a/code/controllers/subsystems/ticker.dm
+++ b/code/controllers/subsystems/ticker.dm
@@ -462,33 +462,15 @@ var/global/datum/controller/subsystem/ticker/ticker
 
 	for (var/mob/living/silicon/ai/aiPlayer in mob_list)
 		if (aiPlayer.stat != 2)
-<<<<<<< HEAD
-			to_world("<span class='filter_system'><b>[aiPlayer.name]'s laws at the end of the round were:</b></span>") //CHOMPedit: stop doxxing of silicons
-||||||| parent of a61da96ec3... Merge pull request #10067 from Little-119/anonybots
-			to_world("<span class='filter_system'><b>[aiPlayer.name] (Played by: [aiPlayer.key])'s laws at the end of the round were:</b></span>")
-=======
 			to_world("<span class='filter_system'><b>[aiPlayer.name]'s laws at the end of the round were:</b></span>") // VOREStation edit
->>>>>>> a61da96ec3... Merge pull request #10067 from Little-119/anonybots
 		else
-<<<<<<< HEAD
-			to_world("<span class='filter_system'><b>[aiPlayer.name]'s laws when it was deactivated were:</b></span>") //CHOMPedit: stop doxxing of silicons
-||||||| parent of a61da96ec3... Merge pull request #10067 from Little-119/anonybots
-			to_world("<span class='filter_system'><b>[aiPlayer.name] (Played by: [aiPlayer.key])'s laws when it was deactivated were:</b></span>")
-=======
 			to_world("<span class='filter_system'><b>[aiPlayer.name]'s laws when it was deactivated were:</b></span>") // VOREStation edit
->>>>>>> a61da96ec3... Merge pull request #10067 from Little-119/anonybots
 		aiPlayer.show_laws(1)
 
 		if (aiPlayer.connected_robots.len)
 			var/robolist = "<b>The AI's loyal minions were:</b> "
 			for(var/mob/living/silicon/robot/robo in aiPlayer.connected_robots)
-<<<<<<< HEAD
-				robolist += "[robo.name][robo.stat?" (Deactivated), ":" , "]" //CHOMPedit: stop doxxing of silicons
-||||||| parent of a61da96ec3... Merge pull request #10067 from Little-119/anonybots
-				robolist += "[robo.name][robo.stat?" (Deactivated) (Played by: [robo.key]), ":" (Played by: [robo.key]), "]"
-=======
 				robolist += "[robo.name][robo.stat?" (Deactivated), ":", "]"  // VOREStation edit
->>>>>>> a61da96ec3... Merge pull request #10067 from Little-119/anonybots
 			to_world("<span class='filter_system'>[robolist]</span>")
 
 	var/dronecount = 0
@@ -506,21 +488,9 @@ var/global/datum/controller/subsystem/ticker/ticker
 
 		if (!robo.connected_ai)
 			if (robo.stat != 2)
-<<<<<<< HEAD
-				to_world("<span class='filter_system'><b>[robo.name] survived as an AI-less stationbound synthetic! Its laws were:</b></span>") //CHOMPedit: stop doxxing of silicons
-||||||| parent of a61da96ec3... Merge pull request #10067 from Little-119/anonybots
-				to_world("<span class='filter_system'><b>[robo.name] (Played by: [robo.key]) survived as an AI-less stationbound synthetic! Its laws were:</b></span>")
-=======
 				to_world("<span class='filter_system'><b>[robo.name] survived as an AI-less stationbound synthetic! Its laws were:</b></span>") // VOREStation edit
->>>>>>> a61da96ec3... Merge pull request #10067 from Little-119/anonybots
 			else
-<<<<<<< HEAD
-				to_world("<span class='filter_system'><b>[robo.name] was unable to survive the rigors of being a stationbound synthetic without an AI. Its laws were:</b></span>") //CHOMPedit: stop doxxing of silicons
-||||||| parent of a61da96ec3... Merge pull request #10067 from Little-119/anonybots
-				to_world("<span class='filter_system'><b>[robo.name] (Played by: [robo.key]) was unable to survive the rigors of being a stationbound synthetic without an AI. Its laws were:</b></span>")
-=======
 				to_world("<span class='filter_system'><b>[robo.name] was unable to survive the rigors of being a stationbound synthetic without an AI. Its laws were:</b></span>") // VOREStation edit
->>>>>>> a61da96ec3... Merge pull request #10067 from Little-119/anonybots
 
 			if(robo) //How the hell do we lose robo between here and the world messages directly above this?
 				robo.laws.show_laws(world)