diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 020e105d9a..04735178d3 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -88,12 +88,8 @@
 
 	//domestication
 	var/tame = 0
-
-<<<<<<< HEAD
 	no_vore = TRUE
-=======
 	var/my_z // I don't want to confuse this with client registered_z 
->>>>>>> d03e4ef... Advanced mob laziness (#33574)
 
 /mob/living/simple_animal/Initialize()
 	. = ..()
@@ -576,4 +572,4 @@
 	..()
 	if (AIStatus == AI_Z_OFF)
 		SSidlenpcpool[old_z] -= src
-		toggle_ai(initial(AIStatus))
\ No newline at end of file
+		toggle_ai(initial(AIStatus))