diff --git a/code/game/objects/structures/crates_lockers/crates/critter.dm b/code/game/objects/structures/crates_lockers/crates/critter.dm
index 579ebd45c7..5261bb5332 100644
--- a/code/game/objects/structures/crates_lockers/crates/critter.dm
+++ b/code/game/objects/structures/crates_lockers/crates/critter.dm
@@ -1,42 +1,3 @@
-<<<<<<< HEAD
-/obj/structure/closet/crate/critter
-	name = "critter crate"
-	desc = "A crate designed for safe transport of animals. It has an oxygen tank for safe transport in space."
-	icon_state = "crittercrate"
-	horizontal = FALSE
-	allow_objects = FALSE
-	breakout_time = 1
-	material_drop = /obj/item/stack/sheet/mineral/wood
-	material_drop_amount = 4
-	delivery_icon = "deliverybox"
-	var/obj/item/tank/internals/emergency_oxygen/tank
-
-/obj/structure/closet/crate/critter/New()
-	..()
-	tank = new
-
-/obj/structure/closet/crate/critter/Destroy()
-	var/turf/T = get_turf(src)
-	if(tank)
-		tank.forceMove(T)
-		tank = null
-
-	return ..()
-
-/obj/structure/closet/crate/critter/update_icon()
-	cut_overlays()
-	if(opened)
-		add_overlay("crittercrate_door_open")
-	else
-		add_overlay("crittercrate_door")
-		if(manifest)
-			add_overlay("manifest")
-
-/obj/structure/closet/crate/critter/return_air()
-	if(tank)
-		return tank.air_contents
-	else
-=======
 /obj/structure/closet/crate/critter
 	name = "critter crate"
 	desc = "A crate designed for safe transport of animals. It has an oxygen tank for safe transport in space."
@@ -74,5 +35,4 @@
 	if(tank)
 		return tank.air_contents
 	else
->>>>>>> 74f5a8c... DisplayTimeText mk2 (#30969)
-		return loc.return_air()
\ No newline at end of file
+		return loc.return_air()