diff --git a/code/modules/economy/vending_machines.dm b/code/modules/economy/vending_machines.dm
index dd3c5e1fb0..88f8e4daa4 100644
--- a/code/modules/economy/vending_machines.dm
+++ b/code/modules/economy/vending_machines.dm
@@ -1293,13 +1293,9 @@
 		/obj/item/clothing/under/rank/virologist/skirt = 5,
 		/obj/item/clothing/shoes/white = 5,
 		/obj/item/clothing/suit/storage/toggle/labcoat/virologist = 5,
-<<<<<<< HEAD
-		/obj/item/clothing/suit/storage/hooded/wintercoat/medical/viro = 5,
-=======
 		/obj/item/clothing/suit/storage/toggle/labcoat/old/vir = 5,
 		/obj/item/clothing/suit/storage/hooded/wintercoat/medical/viro = 5, //VoreStation edit, pre-fulp labcoat.
 		/obj/item/clothing/head/beret/medical/viro = 5,
->>>>>>> cfbe9e8e4e... Merge pull request #11990 from Runa-Dacino/OldSchool-Labcoats
 		/obj/item/clothing/mask/surgical = 5,
 		/obj/item/weapon/storage/backpack/virology = 5,
 		/obj/item/weapon/storage/backpack/satchel/vir = 5