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