diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
index a638c28552..80d8d5a5f1 100644
--- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm
@@ -1328,12 +1328,9 @@
 	ckeywhitelist = list ("thedavestdave")
 	character_name = list("Lucky")
 	allowed_roles = "Chaplain"
-<<<<<<< HEAD
-=======
 
 /datum/gear/fluff/greek_dress
     path = /obj/item/clothing/under/fluff/greek_dress
     display_name = "mytilenean Dress"
     ckeywhitelist = list("sudate")
     character_name = list("Shea Corbett")
->>>>>>> 123a0f4431... Merge pull request #13886 from DefinitelyNotARock/master