diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm
index 88354cd751..fc82ed9283 100644
--- a/code/game/objects/random/misc.dm
+++ b/code/game/objects/random/misc.dm
@@ -1031,11 +1031,7 @@
 			/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/green,
 			/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/green/dark,
 			/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/rainbow,
-<<<<<<< HEAD
 			/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/metal) //CHOMPedit: deleted talon mug
-=======
-			/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/metal,
-			/obj/item/weapon/reagent_containers/food/drinks/glass2/coffeemug/talon)
 
 /obj/random/donkpocketbox
 	name = "Random Donk-pocket Box"
@@ -1051,4 +1047,3 @@
 				/obj/item/weapon/storage/box/donkpockets/honk,
 				/obj/item/weapon/storage/box/donkpockets/gondola,
 				/obj/item/weapon/storage/box/donkpockets/berry)
->>>>>>> 592c8441de... Merge pull request #12662 from GhostActual/donk-pockets