diff --git a/translations-ru.po b/translations-ru.po
index 3b91924..91e14f2 100644
--- a/translations-ru.po
+++ b/translations-ru.po
@@ -28662,11 +28662,7 @@ msgstr ""
 
 #: game/screens.rpy:1197
 msgid "Page {}"
-<<<<<<< Updated upstream
-msgstr "Page {}"
-=======
 msgstr "{} страница"
->>>>>>> Stashed changes
 
 #: game/screens.rpy:1197
 msgid "Automatic saves"
@@ -28674,11 +28670,7 @@ msgstr "Автосохранения"
 
 #: game/screens.rpy:1197
 msgid "Quick saves"
-<<<<<<< Updated upstream
 msgstr "Быстр. Сохранения"
-=======
-msgstr "Быстрые сохранения"
->>>>>>> Stashed changes
 
 #: game/screens.rpy:1243
 msgid "%B %d %Y, %H:%M"
@@ -28686,11 +28678,7 @@ msgstr "%B %d %Y, %H:%M"
 
 #: game/screens.rpy:1243
 msgid "empty slot"
-<<<<<<< Updated upstream
 msgstr "пустой слот"
-=======
-msgstr "Пустой слот"
->>>>>>> Stashed changes
 
 #: game/screens.rpy:1260
 msgid "<"
@@ -28698,19 +28686,15 @@ msgstr "<"
 
 #: game/screens.rpy:1263
 msgid "{#auto_page}A"
-<<<<<<< Updated upstream
 msgstr "{#auto_page}A"
 
 #: game/screens.rpy:1266
 msgid "{#quick_page}Q"
 msgstr "{#quick_page}Q"
-=======
-msgstr "{#auto_page}А"
 
 #: game/screens.rpy:1266
 msgid "{#quick_page}Q"
 msgstr "{#quick_page}Б"
->>>>>>> Stashed changes
 
 #: game/screens.rpy:1272
 msgid ">"
@@ -28718,7 +28702,6 @@ msgstr ">"
 
 #: game/screens.rpy:1385
 msgid "Display"
-<<<<<<< Updated upstream
 msgstr "Отображение"
 
 #: game/screens.rpy:1386
@@ -28732,21 +28715,6 @@ msgstr "Полный экран"
 #: game/screens.rpy:1399
 msgid "Unseen Text"
 msgstr "Непрочитанный текст"
-=======
-msgstr "Режим экрана"
-
-#: game/screens.rpy:1386
-msgid "Window"
-msgstr "Оконный"
-
-#: game/screens.rpy:1387
-msgid "Fullscreen"
-msgstr "Полный"
-
-#: game/screens.rpy:1399
-msgid "Unseen Text"
-msgstr "Всего текста"
->>>>>>> Stashed changes
 
 #: game/screens.rpy:1400
 msgid "After Choices"
@@ -28774,19 +28742,11 @@ msgstr "Громкость звуков"
 
 #: game/screens.rpy:1434
 msgid "Test"
-<<<<<<< Updated upstream
 msgstr "Проверка"
 
 #: game/screens.rpy:1438
 msgid "Voice Volume"
 msgstr "Громкость голосов"
-=======
-msgstr "Тест"
-
-#: game/screens.rpy:1438
-msgid "Voice Volume"
-msgstr "Громкость голоса"
->>>>>>> Stashed changes
 
 #: game/screens.rpy:1449
 msgid "Mute All"