diff --git a/modular_citadel/code/modules/custom_loadout/custom_items.dm b/modular_citadel/code/modules/custom_loadout/custom_items.dm
index f3493e8342..5c8832abb7 100644
--- a/modular_citadel/code/modules/custom_loadout/custom_items.dm
+++ b/modular_citadel/code/modules/custom_loadout/custom_items.dm
@@ -371,11 +371,7 @@
 	icon_state = "leechjar"
 	item_state = "leechjar"
 
-<<<<<<< HEAD
-	path = /obj/item/bedsheet/custom/flagcape
-=======
 /obj/item/bedsheet/custom/flagcape
->>>>>>> 5924595c8d02754cc68433771a8bedbfafdd26dd
 	name = "Flag Cape"
 	desc = "A truly patriotic form of heroic attire."
 	icon = 'icons/obj/custom.dmi'