diff --git a/code/modules/admin/chat_commands.dm b/code/modules/admin/chat_commands.dm
index ef90adb463..dbeb6fce7f 100644
--- a/code/modules/admin/chat_commands.dm
+++ b/code/modules/admin/chat_commands.dm
@@ -103,13 +103,8 @@ GLOBAL_LIST(round_end_notifiees)
 	var/list/text_res = results.Copy(1, 3)
 	var/list/refs = results.len > 3 ? results.Copy(4) : null
 	. = "[text_res.Join("\n")][refs ? "\nRefs: [refs.Join(" ")]" : ""]"
-<<<<<<< HEAD
-
-/datum/server_tools_command/reload_admins
-=======
 	
 /datum/tgs_chat_command/reload_admins
->>>>>>> 575d098... Update DMAPI to version 3.2.1.0 (#37429)
 	name = "reload_admins"
 	help_text = "Forces the server to reload admins."
 	admin_only = TRUE