diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
index 46067b293b..4e83a709b9 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
@@ -1,24 +1,6 @@
-/obj/structure/closet/secure_closet/quartermaster
-	name = "\proper quartermaster's locker"
+/obj/structure/closet/secure_closet/quartermaster
+	name = "\proper quartermaster's locker"
 	req_access = list(ACCESS_QM)
-<<<<<<< HEAD
-	icon_state = "qm"
-
-/obj/structure/closet/secure_closet/quartermaster/PopulateContents()
-	..()
-	new /obj/item/clothing/neck/cloak/qm(src)
-	new /obj/item/clothing/under/rank/cargo(src)
-	new /obj/item/clothing/shoes/sneakers/brown(src)
-	new /obj/item/device/radio/headset/headset_cargo(src)
-	new /obj/item/clothing/suit/fire/firefighter(src)
-	new /obj/item/clothing/gloves/fingerless(src)
-	new /obj/item/device/megaphone/cargo(src)
-	new /obj/item/tank/internals/emergency_oxygen(src)
-	new /obj/item/clothing/mask/gas(src)
-	new /obj/item/clothing/head/soft(src)
-	new /obj/item/device/export_scanner(src)
-	new /obj/item/door_remote/quartermaster(src)
-=======
 	icon_state = "qm"
 
 /obj/structure/closet/secure_closet/quartermaster/PopulateContents()
@@ -36,4 +18,3 @@
 	new /obj/item/clothing/head/soft(src)
 	new /obj/item/device/export_scanner(src)
 	new /obj/item/door_remote/quartermaster(src)
->>>>>>> bdec5d5... Merge pull request #31130 from MrDoomBringer/Doom