diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm
index 2832e2d9bd..89ae371215 100644
--- a/code/modules/client/preference_setup/loadout/loadout_suit.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm
@@ -616,17 +616,8 @@
 /datum/gear/suit/miscellaneous/cardigan/New()
 	..()
 	gear_tweaks += gear_tweak_free_color_choice
-<<<<<<< HEAD
-||||||| parent of 8848775cef... Merge pull request #11479 from PastelPrinceDan/aueugh
-
-/datum/gear/suit/cmddressjacket
-	display_name = "command dress jacket"
-	path = /obj/item/clothing/suit/storage/cmddressjacket
-	allowed_roles = list("Facility Director", "Head of Personnel", "Command Secretary")
-=======
 
 /datum/gear/suit/cmddressjacket
 	display_name = "command dress jacket"
 	path = /obj/item/clothing/suit/storage/cmddressjacket
 	allowed_roles = list("Site Manager", "Head of Personnel", "Command Secretary")
->>>>>>> 8848775cef... Merge pull request #11479 from PastelPrinceDan/aueugh