diff --git a/code/datums/supplypacks/misc_vr.dm b/code/datums/supplypacks/misc_vr.dm
index b3263590ca..940cab62a1 100644
--- a/code/datums/supplypacks/misc_vr.dm
+++ b/code/datums/supplypacks/misc_vr.dm
@@ -160,6 +160,7 @@
 	)
 	cost = 300
 	containertype = /obj/structure/closet/crate
+<<<<<<< HEAD
 	containername = "cordless jukebox speakers crate"
 
 /datum/supply_pack/misc/sword
@@ -174,3 +175,6 @@
 	one_access = TRUE
 	containername = "sword crate"
 	containertype = /obj/structure/closet/crate/secure/gear
+=======
+	containername = "cordless jukebox speakers crate"
+>>>>>>> 7a653038c17... Merge pull request #12267 from PastelPrinceDan/swordcrate
diff --git a/code/datums/supplypacks/munitions.dm b/code/datums/supplypacks/munitions.dm
index daeee1ffbd..71ee712e13 100644
--- a/code/datums/supplypacks/munitions.dm
+++ b/code/datums/supplypacks/munitions.dm
@@ -187,6 +187,14 @@
 	containername = "Magnetic ammunition crate"
 	access = access_security
 
+/datum/supply_pack/munitions/claymore
+	name = "Weapons - Melee - Claymores"
+	contains = list(/obj/item/weapon/material/sword = 2)
+	cost = 150
+	containertype = /obj/structure/closet/crate/secure/weapon
+	containername = "Claymore crate"
+	access = access_armory //two swords that are a one-hit 40 brute + IB chance should be armory-locked
+
 /datum/supply_pack/munitions/shotgunammo
 	name = "Ammunition - Shotgun shells"
 	contains = list(