diff --git a/icons/mob/custom_w.dmi b/icons/mob/custom_w.dmi
index 7c7499ee42..495b6580d1 100644
Binary files a/icons/mob/custom_w.dmi and b/icons/mob/custom_w.dmi differ
diff --git a/modular_citadel/code/modules/client/loadout/__donator.dm b/modular_citadel/code/modules/client/loadout/__donator.dm
index c70b6179b0..517ec2cc93 100644
--- a/modular_citadel/code/modules/client/loadout/__donator.dm
+++ b/modular_citadel/code/modules/client/loadout/__donator.dm
@@ -296,8 +296,16 @@ 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
diff --git a/modular_citadel/code/modules/custom_loadout/custom_items.dm b/modular_citadel/code/modules/custom_loadout/custom_items.dm
index b24d70c809..1db856ec98 100644
--- a/modular_citadel/code/modules/custom_loadout/custom_items.dm
+++ b/modular_citadel/code/modules/custom_loadout/custom_items.dm
@@ -371,6 +371,7 @@
 	icon_state = "leechjar"
 	item_state = "leechjar"
 
+<<<<<<< HEAD
 /obj/item/clothing/neck/devilwings
 	name = "Strange Wings"
 	desc = "These strange wings look like they once attached to something... or someone...? Whatever the case, their presence makes you feel uneasy.."
@@ -380,3 +381,12 @@
 	item_state = "devilwings"
 	worn_x_dimension = 64
 	worn_y_dimension = 34
+=======
+/obj/item/bedsheet/custom/flagcape
+	name = "Flag Cape"
+	desc = "A truly patriotic form of heroic attire."
+	icon = 'icons/obj/custom.dmi'
+	icon_override = 'icons/mob/custom_w.dmi'
+	icon_state = "flagcape"
+	item_state = "flagcape"
+>>>>>>> flagcape