diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
index 74c2302ee9..87d6387b99 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
@@ -348,12 +348,7 @@
 		else
 			data["occupant"]["temperaturestatus"] = "bad"
 
-<<<<<<< HEAD
-
-	var/datum/gas_mixture/air1 = AIR1
-=======
 	var/datum/gas_mixture/air1 = airs[1]
->>>>>>> 6a7dbaa... removes silly garbage defines (#33621)
 	data["cellTemperature"] = round(air1.temperature, 1)
 
 	data["isBeakerLoaded"] = beaker ? TRUE : FALSE