diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm
index 29e3b59d3f..8bd5d570e2 100644
--- a/code/game/objects/items/plushes.dm
+++ b/code/game/objects/items/plushes.dm
@@ -503,9 +503,5 @@
 	icon_state = "plushie_slime"
 	item_state = "plushie_slime"
 	attack_verb = list("blorbled", "slimed", "absorbed")
-<<<<<<< HEAD
-	squeak_override = list('sound/effects/blobattack.ogg' = 1)
-=======
 	squeak_override = list('sound/effects/blobattack.ogg' = 1)
 	gender = FEMALE	//given all the jokes and drawings, I'm not sure the xenobiologists would make a slimeboy
->>>>>>> 502905f... Plushie relationships! (#33184)