diff --git a/code/modules/client/verbs/suicide.dm b/code/modules/client/verbs/suicide.dm
index 9cce4e7660..06e555bb32 100644
--- a/code/modules/client/verbs/suicide.dm
+++ b/code/modules/client/verbs/suicide.dm
@@ -199,23 +199,10 @@
 		death(0)
 
 /mob/living/proc/suicide_log()
-<<<<<<< HEAD
-	var/turf/T = get_turf(src)
-
-	log_game("[key_name(src)] committed suicide at [get_area(src)][COORD(T)] as [src.type].")
-	message_admins("[key_name(src)] committed suicide at [get_area(src)] as [src.type].")
-
-/mob/living/carbon/human/suicide_log()
-	var/turf/T = get_turf(src)
-
-	log_game("[key_name(src)] (job: [src.job ? "[src.job]" : "None"]) committed suicide at [get_area(src)][COORD(T)].")
-	message_admins("[key_name(src)] (job: [job ? "[job]" : "None"]) committed suicide at [get_area(src)].")
-=======
 	log_game("[key_name(src)] committed suicide at [AREACOORD(src)] as [src.type].")
 
 /mob/living/carbon/human/suicide_log()
 	log_game("[key_name(src)] (job: [src.job ? "[src.job]" : "None"]) committed suicide at [AREACOORD(src)].")
->>>>>>> c41d6ac... Standardizes and cleans up some admin messages & logging (#38128)
 
 /mob/living/proc/canSuicide()
 	if(stat == CONSCIOUS)