diff --git a/code/game/objects/effects/decals/remains.dm b/code/game/objects/effects/decals/remains.dm
index 86b852cfeb..75fe78959d 100644
--- a/code/game/objects/effects/decals/remains.dm
+++ b/code/game/objects/effects/decals/remains.dm
@@ -1,34 +1,3 @@
-<<<<<<< HEAD
-/obj/effect/decal/remains
-	name = "remains"
-	gender = PLURAL
-	icon = 'icons/effects/blood.dmi'
-
-/obj/effect/decal/remains/acid_act()
-	visible_message("<span class='warning'>[src] dissolve[gender==PLURAL?"":"s"] into a puddle of sizzling goop!</span>")
-	playsound(src, 'sound/items/welder.ogg', 150, 1)
-	new /obj/effect/decal/cleanable/greenglow(drop_location())
-	qdel(src)
-
-/obj/effect/decal/remains/human
-	desc = "They look like human remains. They have a strange aura about them."
-	icon_state = "remains"
-
-/obj/effect/decal/remains/xeno
-	desc = "They look like the remains of something... alien. They have a strange aura about them."
-	icon_state = "remainsxeno"
-
-/obj/effect/decal/remains/xeno/larva
-	icon_state = "remainslarva"
-
-/obj/effect/decal/remains/robot
-	desc = "They look like the remains of something mechanical. They have a strange aura about them."
-	icon = 'icons/mob/robots.dmi'
-	icon_state = "remainsrobot"
-
-/obj/effect/decal/cleanable/robot_debris/old
-	name = "dusty robot debris"
-=======
 /obj/effect/decal/remains
 	name = "remains"
 	gender = PLURAL
@@ -61,5 +30,4 @@
 
 /obj/effect/decal/cleanable/robot_debris/old
 	name = "dusty robot debris"
->>>>>>> 6c2db52... Snowdin 2.0 (#35000)
-	desc = "Looks like nobody has touched this in a while."
\ No newline at end of file
+	desc = "Looks like nobody has touched this in a while."