diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
index b2ad2917eb..087f58c89f 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
@@ -1,10 +1,3 @@
-<<<<<<< HEAD
-/obj/structure/closet/secure_closet/freezer
-	icon_state = "freezer"
-
-/obj/structure/closet/secure_closet/freezer/kitchen
-	name = "kitchen Cabinet"
-=======
 /obj/structure/closet/secure_closet/freezer
 	icon_state = "freezer"
 	var/jones = FALSE
@@ -17,71 +10,70 @@
 
 /obj/structure/closet/secure_closet/freezer/kitchen
 	name = "kitchen Cabinet"
->>>>>>> ac67dfe... You can now Indiana Jones one explosion. (#30961)
 	req_access = list(ACCESS_KITCHEN)
-
-/obj/structure/closet/secure_closet/freezer/kitchen/PopulateContents()
-	..()
-	for(var/i = 0, i < 3, i++)
-		new /obj/item/reagent_containers/food/condiment/flour(src)
-	new /obj/item/reagent_containers/food/condiment/rice(src)
-	new /obj/item/reagent_containers/food/condiment/sugar(src)
-
-/obj/structure/closet/secure_closet/freezer/kitchen/maintenance
-	name = "maintenance refrigerator"
-	desc = "This refrigerator looks quite dusty, is there anything edible still inside?"
-	req_access = list()
-
-/obj/structure/closet/secure_closet/freezer/kitchen/maintenance/PopulateContents()
-	..()
-	for(var/i = 0, i < 5, i++)
-		new /obj/item/reagent_containers/food/condiment/milk(src)
-	for(var/i = 0, i < 5, i++)
-		new /obj/item/reagent_containers/food/condiment/soymilk(src)
-	for(var/i = 0, i < 2, i++)
-		new /obj/item/storage/fancy/egg_box(src)
-
-/obj/structure/closet/secure_closet/freezer/kitchen/mining
-	req_access = list()
-
-/obj/structure/closet/secure_closet/freezer/meat
-	name = "meat fridge"
-
-/obj/structure/closet/secure_closet/freezer/meat/PopulateContents()
-	..()
-	for(var/i = 0, i < 4, i++)
-		new /obj/item/reagent_containers/food/snacks/meat/slab/monkey(src)
-/obj/structure/closet/secure_closet/freezer/fridge
-	name = "refrigerator"
-
-/obj/structure/closet/secure_closet/freezer/fridge/PopulateContents()
-	..()
-	for(var/i = 0, i < 5, i++)
-		new /obj/item/reagent_containers/food/condiment/milk(src)
-	for(var/i = 0, i < 5, i++)
-		new /obj/item/reagent_containers/food/condiment/soymilk(src)
-	for(var/i = 0, i < 2, i++)
-		new /obj/item/storage/fancy/egg_box(src)
-
-/obj/structure/closet/secure_closet/freezer/money
-	name = "freezer"
-	desc = "This contains cold hard cash."
+
+/obj/structure/closet/secure_closet/freezer/kitchen/PopulateContents()
+	..()
+	for(var/i = 0, i < 3, i++)
+		new /obj/item/reagent_containers/food/condiment/flour(src)
+	new /obj/item/reagent_containers/food/condiment/rice(src)
+	new /obj/item/reagent_containers/food/condiment/sugar(src)
+
+/obj/structure/closet/secure_closet/freezer/kitchen/maintenance
+	name = "maintenance refrigerator"
+	desc = "This refrigerator looks quite dusty, is there anything edible still inside?"
+	req_access = list()
+
+/obj/structure/closet/secure_closet/freezer/kitchen/maintenance/PopulateContents()
+	..()
+	for(var/i = 0, i < 5, i++)
+		new /obj/item/reagent_containers/food/condiment/milk(src)
+	for(var/i = 0, i < 5, i++)
+		new /obj/item/reagent_containers/food/condiment/soymilk(src)
+	for(var/i = 0, i < 2, i++)
+		new /obj/item/storage/fancy/egg_box(src)
+
+/obj/structure/closet/secure_closet/freezer/kitchen/mining
+	req_access = list()
+
+/obj/structure/closet/secure_closet/freezer/meat
+	name = "meat fridge"
+
+/obj/structure/closet/secure_closet/freezer/meat/PopulateContents()
+	..()
+	for(var/i = 0, i < 4, i++)
+		new /obj/item/reagent_containers/food/snacks/meat/slab/monkey(src)
+/obj/structure/closet/secure_closet/freezer/fridge
+	name = "refrigerator"
+
+/obj/structure/closet/secure_closet/freezer/fridge/PopulateContents()
+	..()
+	for(var/i = 0, i < 5, i++)
+		new /obj/item/reagent_containers/food/condiment/milk(src)
+	for(var/i = 0, i < 5, i++)
+		new /obj/item/reagent_containers/food/condiment/soymilk(src)
+	for(var/i = 0, i < 2, i++)
+		new /obj/item/storage/fancy/egg_box(src)
+
+/obj/structure/closet/secure_closet/freezer/money
+	name = "freezer"
+	desc = "This contains cold hard cash."
 	req_access = list(ACCESS_HEADS_VAULT)
-
-/obj/structure/closet/secure_closet/freezer/money/PopulateContents()
-	..()
-	for(var/i = 0, i < 3, i++)
-		new /obj/item/stack/spacecash/c1000(src)
-	for(var/i = 0, i < 5, i++)
-		new /obj/item/stack/spacecash/c500(src)
-	for(var/i = 0, i < 6, i++)
-		new /obj/item/stack/spacecash/c200(src)
-
-/obj/structure/closet/secure_closet/freezer/cream_pie
-	name = "cream pie closet"
-	desc = "Contains pies filled with cream and/or custard, you sickos."
+
+/obj/structure/closet/secure_closet/freezer/money/PopulateContents()
+	..()
+	for(var/i = 0, i < 3, i++)
+		new /obj/item/stack/spacecash/c1000(src)
+	for(var/i = 0, i < 5, i++)
+		new /obj/item/stack/spacecash/c500(src)
+	for(var/i = 0, i < 6, i++)
+		new /obj/item/stack/spacecash/c200(src)
+
+/obj/structure/closet/secure_closet/freezer/cream_pie
+	name = "cream pie closet"
+	desc = "Contains pies filled with cream and/or custard, you sickos."
 	req_access = list(ACCESS_THEATRE)
-
-/obj/structure/closet/secure_closet/freezer/pie/PopulateContents()
-	..()
-	new /obj/item/reagent_containers/food/snacks/pie/cream(src)
+
+/obj/structure/closet/secure_closet/freezer/pie/PopulateContents()
+	..()
+	new /obj/item/reagent_containers/food/snacks/pie/cream(src)