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 5db00f669b..5d11f5e192 100644
--- a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm
@@ -1,16 +1,3 @@
-<<<<<<< HEAD
-/datum/gear/suit/wintercoat/medical
-	allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic")
-
-/datum/gear/suit/wintercoat/science
-	allowed_roles = list("Research Director","Scientist", "Roboticist", "Xenobiologist", "Xenobotanist", "Explorer", "Pathfinder")
-
-||||||| parent of 31fed2ac1a... Merge pull request #10327 from PastelPrinceDan/wintercoats
-/datum/gear/suit/wintercoat/medical
-	allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic")
-
-=======
->>>>>>> 31fed2ac1a... Merge pull request #10327 from PastelPrinceDan/wintercoats
 /datum/gear/suit/snowsuit/medical
 	allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic")
 
@@ -88,4 +75,4 @@
 
 /datum/gear/suit/oversize/New()
 	..()
-	gear_tweaks += gear_tweak_free_color_choice
\ No newline at end of file
+	gear_tweaks += gear_tweak_free_color_choice