diff --git a/lang/gpxsee_ru.ts b/lang/gpxsee_ru.ts
index bd0b8b5d..324e40d1 100644
--- a/lang/gpxsee_ru.ts
+++ b/lang/gpxsee_ru.ts
@@ -1095,10 +1095,14 @@
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="46"/>
         <source>Standard</source>
+<<<<<<< HEAD
 <<<<<<< HEAD
         <translation>Стандартный</translation>
 =======
         <translation>Стандартное</translation>
+>>>>>>> Translated using Weblate (Russian)
+=======
+        <translation>Стандартный</translation>
 >>>>>>> Translated using Weblate (Russian)
     </message>
     <message>