diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm
index 5564ee8657..0660735db4 100644
--- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm	
+++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm	
@@ -876,21 +876,6 @@ GLOBAL_VAR_INIT(teppi_count, 0)	// How mant teppi DO we have?
 	speak_chance = 0.5
 	wander = TRUE
 
-<<<<<<< HEAD
-/datum/language/teppi
-	name = "Teppi"
-	desc = "The language of the meat things."
-	speech_verb = "rumbles"
-	ask_verb = "tilts"
-	exclaim_verb = "roars"
-	key = "i"
-	flags = RESTRICTED
-	machine_understands = 0
-	space_chance = 100
-	syllables = list("gyoh", "snoof", "gyoooooOOOooh", "iuuuuh", "gyuuuuh")
-
-=======
->>>>>>> 6ee75cc608... Merge pull request #13255 from Heroman3003/language-preview
 ////////////////// Da babby //////////////
 
 /mob/living/simple_mob/vore/alienanimals/teppi/baby