diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
index 6ec8694099..867199cde7 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
@@ -36,8 +36,8 @@
 					LANGUAGE_ECUREUILIAN= 1,
 					LANGUAGE_DAEMON		= 1,
 					LANGUAGE_ENOCHIAN	= 1,
-<<<<<<< HEAD
-					LANGUAGE_SQUEAKISH	= 1 //CHOMPedit
+					LANGUAGE_DRUDAKAR	= 1,
+					LANGUAGE_TAVAN		= 1
 					)
 
 /obj/item/weapon/robot_module/robot/chound
@@ -58,12 +58,8 @@
 					LANGUAGE_ECUREUILIAN= 1,
 					LANGUAGE_DAEMON		= 1,
 					LANGUAGE_ENOCHIAN	= 1,
-					LANGUAGE_DRUDAKAR	= 1,
-					LANGUAGE_SQUEAKISH	= 1 //CHOMPedit
-=======
 					LANGUAGE_DRUDAKAR	= 1,
 					LANGUAGE_TAVAN		= 1
->>>>>>> 3f701c8c8a... Merge pull request #11821 from Enzo-Leon/altevian-001
 					)
 
 /hook/startup/proc/robot_modules_vr()