diff --git a/code/modules/xenobio2/mob/xeno.dm b/code/modules/xenobio2/mob/xeno.dm
index 477a6f7043..9d54c55b60 100644
--- a/code/modules/xenobio2/mob/xeno.dm
+++ b/code/modules/xenobio2/mob/xeno.dm
@@ -101,12 +101,6 @@ Also includes Life and New
 		stasis += hit.stasisforce
 	..()
 
-<<<<<<< HEAD
 /mob/living/simple_animal/xeno/Destroy()
 	QDEL_NULL(traitdat)
-=======
-/mob/living/simple_mob/xeno/Destroy()
-	traitdat.Destroy()	//Let's clean up after ourselves.
-	traitdat = null
->>>>>>> 1ef36f1a6e... Merge pull request #13709 from Heroman3003/remove-animal
-	..()
\ No newline at end of file
+	..()