diff --git a/code/game/objects/structures/crates_lockers/closets/syndicate.dm b/code/game/objects/structures/crates_lockers/closets/syndicate.dm
index 7687c42c3c..3edbde93b7 100644
--- a/code/game/objects/structures/crates_lockers/closets/syndicate.dm
+++ b/code/game/objects/structures/crates_lockers/closets/syndicate.dm
@@ -1,120 +1,3 @@
-<<<<<<< HEAD
-/obj/structure/closet/syndicate
-	name = "armory closet"
-	desc = "Why is this here?"
-	icon_state = "syndicate"
-
-/obj/structure/closet/syndicate/personal
-	desc = "It's a personal storage unit for operative gear."
-
-/obj/structure/closet/syndicate/personal/PopulateContents()
-	..()
-	new /obj/item/clothing/under/syndicate(src)
-	new /obj/item/clothing/shoes/sneakers/black(src)
-	new /obj/item/radio/headset/syndicate(src)
-	new /obj/item/ammo_box/magazine/m10mm(src)
-	new /obj/item/storage/belt/military(src)
-	new /obj/item/crowbar/red(src)
-	new /obj/item/clothing/glasses/night(src)
-
-/obj/structure/closet/syndicate/nuclear
-	desc = "It's a storage unit for a Syndicate boarding party."
-
-/obj/structure/closet/syndicate/nuclear/PopulateContents()
-	for(var/i in 1 to 5)
-		new /obj/item/ammo_box/magazine/m10mm(src)
-	new /obj/item/storage/box/flashbangs(src)
-	new /obj/item/storage/box/teargas(src)
-	new /obj/item/storage/backpack/duffelbag/syndie/med(src)
-	new /obj/item/pda/syndicate(src)
-
-/obj/structure/closet/syndicate/resources
-	desc = "An old, dusty locker."
-
-/obj/structure/closet/syndicate/resources/PopulateContents()
-	..()
-	var/common_min = 30 //Minimum amount of minerals in the stack for common minerals
-	var/common_max = 50 //Maximum amount of HONK in the stack for HONK common minerals
-	var/rare_min = 5  //Minimum HONK of HONK in the stack HONK HONK rare minerals
-	var/rare_max = 20 //Maximum HONK HONK HONK in the HONK for HONK rare HONK
-
-
-	var/pickednum = rand(1, 50)
-
-	//Sad trombone
-	if(pickednum == 1)
-		var/obj/item/paper/P = new /obj/item/paper(src)
-		P.name = "\improper IOU"
-		P.info = "Sorry man, we needed the money so we sold your stash. It's ok, we'll double our money for sure this time!"
-
-	//Metal (common ore)
-	if(pickednum >= 2)
-		new /obj/item/stack/sheet/metal(src, rand(common_min, common_max))
-
-	//Glass (common ore)
-	if(pickednum >= 5)
-		new /obj/item/stack/sheet/glass(src, rand(common_min, common_max))
-
-	//Plasteel (common ore) Because it has a million more uses then plasma
-	if(pickednum >= 10)
-		new /obj/item/stack/sheet/plasteel(src, rand(common_min, common_max))
-
-	//Plasma (rare ore)
-	if(pickednum >= 15)
-		new /obj/item/stack/sheet/mineral/plasma(src, rand(rare_min, rare_max))
-
-	//Silver (rare ore)
-	if(pickednum >= 20)
-		new /obj/item/stack/sheet/mineral/silver(src, rand(rare_min, rare_max))
-
-	//Gold (rare ore)
-	if(pickednum >= 30)
-		new /obj/item/stack/sheet/mineral/gold(src, rand(rare_min, rare_max))
-
-	//Uranium (rare ore)
-	if(pickednum >= 40)
-		new /obj/item/stack/sheet/mineral/uranium(src, rand(rare_min, rare_max))
-
-	//Titanium (rare ore)
-	if(pickednum >= 40)
-		new /obj/item/stack/sheet/mineral/titanium(src, rand(rare_min, rare_max))
-
-	//Plastitanium (rare ore)
-	if(pickednum >= 40)
-		new /obj/item/stack/sheet/mineral/plastitanium(src, rand(rare_min, rare_max))
-
-	//Diamond (rare HONK)
-	if(pickednum >= 45)
-		new /obj/item/stack/sheet/mineral/diamond(src, rand(rare_min, rare_max))
-
-	//Jetpack (You hit the jackpot!)
-	if(pickednum == 50)
-		new /obj/item/tank/jetpack/carbondioxide(src)
-
-/obj/structure/closet/syndicate/resources/everything
-	desc = "It's an emergency storage closet for repairs."
-
-/obj/structure/closet/syndicate/resources/everything/PopulateContents()
-	var/list/resources = list(
-	/obj/item/stack/sheet/metal,
-	/obj/item/stack/sheet/glass,
-	/obj/item/stack/sheet/mineral/gold,
-	/obj/item/stack/sheet/mineral/silver,
-	/obj/item/stack/sheet/mineral/plasma,
-	/obj/item/stack/sheet/mineral/uranium,
-	/obj/item/stack/sheet/mineral/diamond,
-	/obj/item/stack/sheet/mineral/bananium,
-	/obj/item/stack/sheet/plasteel,
-	/obj/item/stack/sheet/mineral/titanium,
-	/obj/item/stack/sheet/mineral/plastitanium,
-	/obj/item/stack/rods
-	)
-
-	for(var/i = 0, i<2, i++)
-		for(var/res in resources)
-			var/obj/item/stack/R = new res(src)
-			R.amount = R.max_amount
-=======
 /obj/structure/closet/syndicate
 	name = "armory closet"
 	desc = "Why is this here?"
@@ -230,4 +113,3 @@
 		for(var/res in resources)
 			var/obj/item/stack/R = res
 			new res(src, initial(R.max_amount))
->>>>>>> e8304c1... Merge pull request #37760 from YPOQ/stackfix