diff --git a/code/game/objects/items/toys/toys.dm b/code/game/objects/items/toys/toys.dm
index 1a2367cae31..e428ddfc544 100644
--- a/code/game/objects/items/toys/toys.dm
+++ b/code/game/objects/items/toys/toys.dm
@@ -814,13 +814,6 @@
 	name = "void carp plushie"
 	icon_state = "voidcarp"
 
-// Eris
-/obj/structure/plushie/fumo
-	name = "Fumo"
-	desc = "A plushie of a....?."
-	icon_state = "fumoplushie"
-	phrase = "I just don't think about losing."
-
 //Large plushies.
 /obj/structure/plushie
 	name = "generic plush"
@@ -1258,14 +1251,11 @@
 	icon_state = "therapygreen"
 	item_state = "egg3" // It's the green egg in items_left/righthand
 
-<<<<<<< HEAD
-=======
 /obj/item/toy/plushie/fumo
 	name = "Fumo"
-	desc = "A plushie of a....?."
+	desc = "A plushie of a....?"
 	icon_state = "fumoplushie"
 	pokephrase = "I just don't think about losing."
->>>>>>> ac33af27705... Merge pull request #8239 from Cerebulon/fumo
 
 //Toy cult sword
 /obj/item/toy/cultsword