diff --git a/modular_citadel/code/modules/client/loadout/__donator.dm b/modular_citadel/code/modules/client/loadout/__donator.dm
index 517ec2cc93..df4d98f295 100644
--- a/modular_citadel/code/modules/client/loadout/__donator.dm
+++ b/modular_citadel/code/modules/client/loadout/__donator.dm
@@ -296,16 +296,14 @@ datum/gear/darksabresheath
 	path = /obj/item/clothing/suit/armor/vest/darkcarapace
 	ckeywhitelist = list("inferno707")
 
-<<<<<<< HEAD
 /datum/gear/devilwings
 	name = "Strange Wings"
 	category = SLOT_NECK
 	path = /obj/item/clothing/neck/devilwings
 	ckeywhitelist = list("kitsun")
-=======
+
 /datum/gear/flagcape
 	name = "US Flag Cape"
 	category = SLOT_IN_BACKPACK
 	path = /obj/item/bedsheet/custom/flagcape
 	ckeywhitelist = list("darnchacha")
->>>>>>> flagcape