diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index 7595b5276b..1a610d97a6 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -459,8 +459,4 @@
 		death()
 		var/obj/item/organ/brain/B = getorganslot(ORGAN_SLOT_BRAIN)
 		if(B)
-<<<<<<< HEAD
-			B.damaged_brain = TRUE
-=======
 			B.damaged_brain = TRUE
->>>>>>> 15864dc... Temperature Refactor and Fixes (#34133)