diff --git a/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm b/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
index 7ee718bf25..7a43fbba5b 100644
--- a/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
@@ -69,18 +69,14 @@
 	display_name = "contractor identification card"
 	path = /obj/item/weapon/card/id/event/polymorphic/altcard
 	cost = 1
-<<<<<<< HEAD
-=======
 
 /datum/gear/utility/bs_bracelet
 	display_name = "bluespace bracelet"
 	path = /obj/item/clothing/gloves/bluespace
 	cost = 5
 
-
 /datum/gear/utility/satchel_strapless
 	display_name = "satchel strapless"
 	path = /obj/item/weapon/storage/backpack/satchel/strapless
 	slot = slot_back
 	cost = 1
->>>>>>> 4083e13dd27... Merge pull request #12191 from TheDavestDave/strapless