diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 8ac3aa411a..42e15662cb 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -64,11 +64,9 @@
 	else
 		//ghostize
 		var/mob/body = mob
-<<<<<<< HEAD
 		var/mob/observer/dead/ghost = body.ghostize(1)
 		ghost.admin_ghosted = 1
 		log_and_message_admins("[key_name(src)] admin-ghosted.") // CHOMPEdit - Add logging.
-=======
 		var/mob/observer/dead/ghost
 		if(build_mode)
 			togglebuildmode(body)
@@ -79,7 +77,6 @@
 		else
 			ghost = body.ghostize(1)
 			ghost.admin_ghosted = 1
->>>>>>> 2c7c9c3fec... Merge pull request #13094 from ItsSelis/rcon-fix
 		if(body)
 			body.teleop = ghost
 			if(!body.key)
@@ -564,4 +561,4 @@
 	T.spell_list += new S
 	feedback_add_details("admin_verb","GS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 	log_admin("[key_name(usr)] gave [key_name(T)] the spell [S].")
-	message_admins("<font color='blue'>[key_name_admin(usr)] gave [key_name(T)] the spell [S].</font>", 1)
\ No newline at end of file
+	message_admins("<font color='blue'>[key_name_admin(usr)] gave [key_name(T)] the spell [S].</font>", 1)