diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm
index 057b54df09..7a20d0ee8e 100644
--- a/code/modules/mob/say.dm
+++ b/code/modules/mob/say.dm
@@ -152,13 +152,8 @@
 /mob/proc/find_valid_prefixes(message)
 	var/list/prefixes = list() // [["Common", start, end], ["Gutter", start, end]]
 	for(var/i in 1 to length(message))
-<<<<<<< HEAD
-		// This grabs trimmed 3 character substrings, to allow for up to 1 prefix and 1 letter language keys
-		var/selection = trim_right(copytext(message, i, i + 2)) // VOREStation Edit: We use uppercase keys to avoid Polaris key duplication, but this had lowertext() in it
-=======
 		// This grabs 3 character substrings, to allow for up to 1 prefix, 1 letter language key, and one post-key character to more strictly control where the language breaks happen
-		var/selection = lowertext(copytext(message, i, i + 3))
->>>>>>> 021f874... Adds preference to control multilingual behaviour (#7064)
+		var/selection = trim_right(copytext(message, i, i + 3)) // VOREStation Edit: We use uppercase keys to avoid Polaris key duplication, but this had lowertext() in it
 		// The first character in the selection will always be the prefix (if this is a valid language invocation)
 		var/prefix = copytext(selection, 1, 2)
 		var/language_key = copytext(selection, 2, 3)