diff --git a/code/modules/mob/living/carbon/alien/humanoid/death.dm b/code/modules/mob/living/carbon/alien/humanoid/death.dm
index 7e3ea698c3..5d85ace4a6 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/death.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/death.dm
@@ -1,27 +1,3 @@
-<<<<<<< HEAD
-/mob/living/carbon/alien/humanoid/death(gibbed)
-	if(stat == DEAD)
-		return
-
-	. = ..()
-
-	update_canmove()
-	update_icons()
-	status_flags |= CANPUSH
-
-//When the alien queen dies, all others must pay the price for letting her die.
-/mob/living/carbon/alien/humanoid/royal/queen/death(gibbed)
-	if(stat == DEAD)
-		return
-
-	for(var/mob/living/carbon/C in GLOB.living_mob_list)
-		if(C == src) //Make sure not to proc it on ourselves.
-			continue
-		var/obj/item/organ/alien/hivenode/node = C.getorgan(/obj/item/organ/alien/hivenode)
-		if(istype(node)) // just in case someone would ever add a diffirent node to hivenode slot
-			node.queen_death()
-
-=======
 /mob/living/carbon/alien/humanoid/death(gibbed)
 	if(stat == DEAD)
 		return
@@ -44,5 +20,4 @@
 		if(istype(node)) // just in case someone would ever add a diffirent node to hivenode slot
 			node.queen_death()
 
->>>>>>> 39375d5... Replaces a bunch of mob loops with hopefully better ones (#32786)
-	return ..()
\ No newline at end of file
+	return ..()