diff --git a/code/modules/events/alien_infestation.dm b/code/modules/events/alien_infestation.dm
index 2bbbb33806..662d938bd6 100644
--- a/code/modules/events/alien_infestation.dm
+++ b/code/modules/events/alien_infestation.dm
@@ -40,13 +40,8 @@
 	for(var/obj/machinery/atmospherics/components/unary/vent_pump/temp_vent in GLOB.machines)
 		if(QDELETED(temp_vent))
 			continue
-<<<<<<< HEAD
-		if((temp_vent.loc.z in GLOB.station_z_levels) && !temp_vent.welded)
-			var/datum/pipeline/temp_vent_parent = temp_vent.PARENT1
-=======
 		if(is_station_level(temp_vent.loc.z) && !temp_vent.welded)
 			var/datum/pipeline/temp_vent_parent = temp_vent.parents[1]
->>>>>>> f2dbe5c... Replace explicit z-level checks with defines (#33829)
 			//Stops Aliens getting stuck in small networks.
 			//See: Security, Virology
 			if(temp_vent_parent.other_atmosmch.len > 20)