diff --git a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm
index 838cec7cf0..8ab986be6e 100644
--- a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm
@@ -82,13 +82,5 @@
 Talon winter coat
 */
 /datum/gear/suit/wintercoat/talon
-<<<<<<< HEAD
-	display_name = "winter coat, ITV"
-	path = /obj/item/clothing/suit/storage/hooded/wintercoat/talon
-||||||| parent of 982d88145d... Merge pull request #11142 from Heroman3003/Talonflufffix
-	display_name = "winter coat, ITV"
-	path = /obj/item/clothing/suit/storage/hooded/wintercoat/talon
-=======
 	display_name = "winter coat, Talon"
 	path = /obj/item/clothing/suit/storage/hooded/wintercoat/talon
->>>>>>> 982d88145d... Merge pull request #11142 from Heroman3003/Talonflufffix