diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm
index 70de9ba6ef..ae38e622ab 100644
--- a/code/game/objects/random/misc.dm
+++ b/code/game/objects/random/misc.dm
@@ -673,14 +673,8 @@
 				/obj/item/toy/plushie/borgplushie/scrubpuppy,
 				/obj/item/toy/plushie/foxbear,
 				/obj/item/toy/plushie/nukeplushie,
-<<<<<<< HEAD
 				/obj/item/toy/plushie/otter,
-||||||| parent of f98b1e125e... Merge pull request #9520 from Novacat/nova-basicfixes
-				/obj/item/toy/plushie/otter)
-=======
-				/obj/item/toy/plushie/otter,
-				/obj/item/toy/plushie/vox)
->>>>>>> f98b1e125e... Merge pull request #9520 from Novacat/nova-basicfixes
+				/obj/item/toy/plushie/vox,
 				//VOREStation Add End
 				//YawnWider Add Start
 				/obj/item/toy/plushie/teshari/_yw,