diff --git a/code/modules/mob/living/carbon/alien/life.dm b/code/modules/mob/living/carbon/alien/life.dm
index 4cfba35100..1543d6b716 100644
--- a/code/modules/mob/living/carbon/alien/life.dm
+++ b/code/modules/mob/living/carbon/alien/life.dm
@@ -1,59 +1,3 @@
-<<<<<<< HEAD
-/mob/living/carbon/alien/Life()
-	findQueen()
-	return..()
-
-/mob/living/carbon/alien/check_breath(datum/gas_mixture/breath)
-	if(status_flags & GODMODE)
-		return
-
-	if(!breath || (breath.total_moles() == 0))
-		//Aliens breathe in vaccuum
-		return 0
-
-	var/toxins_used = 0
-	var/tox_detect_threshold = 0.02
-	var/breath_pressure = (breath.total_moles()*R_IDEAL_GAS_EQUATION*breath.temperature)/BREATH_VOLUME
-	var/list/breath_gases = breath.gases
-
-	breath.assert_gases("plasma", "o2")
-
-	//Partial pressure of the toxins in our breath
-	var/Toxins_pp = (breath_gases["plasma"][MOLES]/breath.total_moles())*breath_pressure
-
-	if(Toxins_pp > tox_detect_threshold) // Detect toxins in air
-		adjustPlasma(breath_gases["plasma"][MOLES]*250)
-		throw_alert("alien_tox", /obj/screen/alert/alien_tox)
-
-		toxins_used = breath_gases["plasma"][MOLES]
-
-	else
-		clear_alert("alien_tox")
-
-	//Breathe in toxins and out oxygen
-	breath_gases["plasma"][MOLES] -= toxins_used
-	breath_gases["o2"][MOLES] += toxins_used
-
-	breath.garbage_collect()
-
-	//BREATH TEMPERATURE
-	handle_breath_temperature(breath)
-
-/mob/living/carbon/alien/handle_status_effects()
-	..()
-	//natural reduction of movement delay due to stun.
-	if(move_delay_add > 0)
-		move_delay_add = max(0, move_delay_add - rand(1, 2))
-
-/mob/living/carbon/alien/handle_changeling()
-	return
-
-/mob/living/carbon/alien/handle_fire()//Aliens on fire code
-	if(..())
-		return
-	bodytemperature += BODYTEMP_HEATING_MAX //If you're on fire, you heat up!
-	return
-=======
 /mob/living/carbon/alien/Life()
 	findQueen()
 	return..()
@@ -108,4 +52,3 @@
 		return
 	bodytemperature += BODYTEMP_HEATING_MAX //If you're on fire, you heat up!
 	return
->>>>>>> 454d16f... Minor refactor of how gas IDs are handled (#31528)