diff --git a/locale/ru-ru/texts.po b/locale/ru-ru/texts.po
index 8cc78b21b..f3b11bb36 100644
--- a/locale/ru-ru/texts.po
+++ b/locale/ru-ru/texts.po
@@ -1089,7 +1089,6 @@ msgstr ""
 msgid "Open"
 msgstr "Открыть"
 
-<<<<<<< HEAD
 #: src/sagas/tokens.js:40
 msgid "Wallet is not ready yet."
 msgstr ""
@@ -1125,17 +1124,6 @@ msgid "You can always change this later in the settings menu"
 msgstr ""
 
 #: src/components/AskForPushNotification.js:31
-=======
-#: src/components/AskForPushNotification.js:22
-msgid "Do you want to enable push notifications for this wallet?"
-msgstr ""
-
-#: src/components/AskForPushNotification.js:23
-msgid "You can always change this later in the settings menu"
-msgstr ""
-
-#: src/components/AskForPushNotification.js:24
->>>>>>> d1995ae (fix: custom network settings form (#461))
 msgid "Yes, enable"
 msgstr ""
 
diff --git a/src/constants.js b/src/constants.js
index a2e182b7b..27de995a9 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -275,6 +275,7 @@ export const NETWORK_PRIVATENET = 'privatenet';
 export const MAX_RETRIES = 8;
 export const INITIAL_RETRY_LATENCY = 300; // ms
 export const LATENCY_MULTIPLIER = 30; // multiplier per iteration
+
 /**
  * Timeout for await wallet load in the context of tx details loading.
  * It awaits 5 minutes.