diff --git a/Themes/_fallback/Languages/de.ini b/Themes/_fallback/Languages/de.ini
index 078c9b29da..2ab081597b 100644
--- a/Themes/_fallback/Languages/de.ini
+++ b/Themes/_fallback/Languages/de.ini
@@ -2723,4 +2723,3 @@ UnknownPreference=Unknown preference "%s"
 ChoicesSizeMismatch=Choices and Values have different sizes (%d, %d)
 NoDefaultInValues=Preference "%s" has no values matching default
 TypeMismatch=Type mismatch between default (%s) and value %d (%s)
->>>>>>> other
diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini
index ca31e6b367..ea0b08a71d 100644
--- a/Themes/_fallback/Languages/en.ini
+++ b/Themes/_fallback/Languages/en.ini
@@ -2784,4 +2784,3 @@ UnknownPreference=Unknown preference "%s"
 ChoicesSizeMismatch=Choices and Values have different sizes (%d, %d)
 NoDefaultInValues=Preference "%s" has no values matching default
 TypeMismatch=Type mismatch between default (%s) and value %d (%s)
->>>>>>> other
diff --git a/Themes/_fallback/Languages/es.ini b/Themes/_fallback/Languages/es.ini
index 943b7bda6e..abbd3cfcaf 100644
--- a/Themes/_fallback/Languages/es.ini
+++ b/Themes/_fallback/Languages/es.ini
@@ -2696,4 +2696,3 @@ UnknownPreference=Opción "%s" desconocida
 ChoicesSizeMismatch=Las elecciones y los valores tienen tamaños diferentes (%d, %d)
 NoDefaultInValues=La opción "%s" no tiene valores equivalentes al de por defecto.
 TypeMismatch=El tipo no coincide con el por defecto (%s) y el valor %d (%s)
->>>>>>> other
diff --git a/Themes/_fallback/Languages/fr.ini b/Themes/_fallback/Languages/fr.ini
index 892a752a72..9b8bdaf51a 100644
--- a/Themes/_fallback/Languages/fr.ini
+++ b/Themes/_fallback/Languages/fr.ini
@@ -2704,4 +2704,3 @@ UnknownPreference=Préférence Inconnue "%s"
 ChoicesSizeMismatch=Les Choix et les Valeurs ont différentes tailles (%d, %d)
 NoDefaultInValues=Préférence "%s" n'a aucune valeur correspondante au paramètre par défaut.
 TypeMismatch=Incohérence de Type entre défaut (%s) et la valeur %d (%s)
->>>>>>> Autre
diff --git a/Themes/_fallback/Languages/ja.ini b/Themes/_fallback/Languages/ja.ini
index 735effe72e..3713eb3921 100644
--- a/Themes/_fallback/Languages/ja.ini
+++ b/Themes/_fallback/Languages/ja.ini
@@ -2929,4 +2929,3 @@ UnknownPreference="%s"は未知の設定です。
 ChoicesSizeMismatch=選択値と実際の値が食い違っています。(%d, %d)
 NoDefaultInValues=設定"%s"の設定値は省略できません。
 TypeMismatch=引数(%s)と入力値%d(%s)の変数型が違います。
->>>>>>> other
diff --git a/Themes/_fallback/Languages/nl.ini b/Themes/_fallback/Languages/nl.ini
index 29cd9b66c2..4f24ca908e 100644
--- a/Themes/_fallback/Languages/nl.ini
+++ b/Themes/_fallback/Languages/nl.ini
@@ -2719,4 +2719,3 @@ UnknownPreference=Onbekende instelling "%s"
 ChoicesSizeMismatch=Keuzen en Waardes hebben verschillende grootten (%d, %d)
 NoDefaultInValues=Instelling "%s" heeft geen waarden vergelijkbaar met de standaard
 TypeMismatch=De typen van de standaard (%s) en de waarde %d (%s) komen niet overeen. 
->>>>>>> anders
diff --git a/Themes/_fallback/Languages/pl.ini b/Themes/_fallback/Languages/pl.ini
index 6fb62f7d3b..2abcc00bf7 100644
--- a/Themes/_fallback/Languages/pl.ini
+++ b/Themes/_fallback/Languages/pl.ini
@@ -2684,4 +2684,3 @@ UnknownPreference=Nieznane ustawienie "%s"
 ChoicesSizeMismatch=Opcje i Wartości mają różne rozmiary (%d, %d)
 NoDefaultInValues=Ustawienie "%s" nie posiada wartości odpowiadającej domyślnej.
 TypeMismatch=Niezgodność typów pomiędzy domyślną (%s) i wartością %d (%s)
->>>>>>> inne
diff --git a/Themes/_fallback/Languages/zh-Hant.ini b/Themes/_fallback/Languages/zh-Hant.ini
index a7f4a894f6..c23dadac47 100644
--- a/Themes/_fallback/Languages/zh-Hant.ini
+++ b/Themes/_fallback/Languages/zh-Hant.ini
@@ -2751,4 +2751,3 @@ UnknownPreference=未知參數 "%s"
 ChoicesSizeMismatch=Choices and Values have different sizes (%d, %d)
 NoDefaultInValues=沒有與預設相符的參數數値 "%s"
 TypeMismatch=預設 (%s) 與數値 %d (%s) 不匹配
->>>>>>> other