diff --git a/code/modules/mob/living/silicon/ai/ai_vr.dm b/code/modules/mob/living/silicon/ai/ai_vr.dm
index f10b504b75..7501556cc7 100644
--- a/code/modules/mob/living/silicon/ai/ai_vr.dm
+++ b/code/modules/mob/living/silicon/ai/ai_vr.dm
@@ -7,11 +7,7 @@
 	add_language(LANGUAGE_DAEMON,		1)
 	add_language(LANGUAGE_ENOCHIAN,		1)
 	add_language(LANGUAGE_DRUDAKAR,		1)
-<<<<<<< HEAD
-	add_language(LANGUAGE_SQUEAKISH,	1) //CHOMPedit
-=======
 	add_language(LANGUAGE_TAVAN,		1)	
->>>>>>> 3f701c8c8a... Merge pull request #11821 from Enzo-Leon/altevian-001
 
 /mob/AIize(var/move = TRUE)
 	. = ..()
@@ -22,8 +18,4 @@
 	add_language(LANGUAGE_DAEMON,		1)
 	add_language(LANGUAGE_ENOCHIAN,		1)
 	add_language(LANGUAGE_DRUDAKAR,		1)
-<<<<<<< HEAD
-	add_language(LANGUAGE_SQUEAKISH,	1) //CHOMPedit
-=======
 	add_language(LANGUAGE_TAVAN,		1)
->>>>>>> 3f701c8c8a... Merge pull request #11821 from Enzo-Leon/altevian-001