diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index d0dd1796bf..8cb7043bad 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -58,13 +58,6 @@
 
 	var/datum/gas_mixture/breath
 
-<<<<<<< HEAD
-	if(health <= HEALTH_THRESHOLD_CRIT || (pulledby && pulledby.grab_state >= GRAB_KILL && !getorganslot("breathing_tube")))
-		losebreath++
-
-	//Suffocate
-	if(losebreath > 0)
-=======
 	if(!getorganslot("breathing_tube"))
 		if(health <= HEALTH_THRESHOLD_FULLCRIT || (pulledby && pulledby.grab_state >= GRAB_KILL))
 			losebreath++  //You can't breath at all when in critical or when being choked, so you're going to miss a breath
@@ -74,7 +67,6 @@
 
 	//Suffocate
 	if(losebreath >= 1) //You've missed a breath, take oxy damage
->>>>>>> d4e09c9... Losebreath (#30580)
 		losebreath--
 		if(prob(10))
 			emote("gasp")
@@ -126,10 +118,6 @@
 		if(reagents.has_reagent("epinephrine") && lungs)
 			return
 		adjustOxyLoss(1)
-<<<<<<< HEAD
-=======
-
->>>>>>> d4e09c9... Losebreath (#30580)
 		failed_last_breath = 1
 		throw_alert("not_enough_oxy", /obj/screen/alert/not_enough_oxy)
 		return 0