diff --git a/configs/php/.env b/configs/php/.env
index 0c5f2ee..0ad9599 100644
--- a/configs/php/.env
+++ b/configs/php/.env
@@ -8,13 +8,8 @@ DATABASE_URL_DOT=mysql://root:root@db:3306/dot?serverVersion=mariadb-10.3.25
 DATABASE_URL_DOT_STATISTIC=mysql://root:root@db:3306/dot_statistic?serverVersion=mariadb-10.3.25
 
 DOCUMENT_ROOT=/application
-<<<<<<< HEAD
 APP_HOST=staging.dot-dot.ru
 APP_SCHEME=https
-=======
-APP_HOST=teste.dot-dot.ru
-APP_SCHEME=http
->>>>>>> bf9c2589f2048793e390ff4d31f979bf6e8ab2c4
 
 MAILER_DSN=null://null
 
@@ -59,19 +54,11 @@ GOOGLE_MAPS_BASE_URL=https://maps.google.com
 
 ML_CALCULATOR_URL=https://ml.dot-dot.ru/v2/classification/order/relevance
 
-<<<<<<< HEAD
 ML_REGULAR_DIRECTION_URL=https://ml.dot-dot.ru/v2/schedule/transport
 ML_REGULAR_DIRECTION_CHAIN_URL=https://ml.dot-dot.ru/v1/schedule/chains
 ML_REGULAR_DIRECTION_RELEVANCE_CARRIERS_URL=https://ml.dot-dot.ru/v1/schedule/carrier/scoring
 ML_REGULAR_DIRECTION_CHAIN_RELEVANCE_CARRIERS_URL=https://ml.dot-dot.ru/v1/schedule/chains/carrier/scoring
 ML_UNCERTAIN_DIRECTIONS_URL=https://ml.dot-dot.ru/v1/classification/direction/uncertain
-=======
-ML_REGULAR_DIRECTION_URL=https://calc.dev.dot-dot.ru/v2/schedule/transport
-ML_REGULAR_DIRECTION_CHAIN_URL=https://calc.dev.dot-dot.ru/v1/schedule/chains
-ML_REGULAR_DIRECTION_RELEVANCE_CARRIERS_URL=https://calc.dev.dot-dot.ru/v1/schedule/carrier/scoring
-ML_REGULAR_DIRECTION_CHAIN_RELEVANCE_CARRIERS_URL=https://calc.dev.dot-dot.ru/v1/schedule/chains/carrier/scoring
-ML_UNCERTAIN_DIRECTIONS_URL=https://calc.dev.dot-dot.ru/v1/classification/direction/uncertain
->>>>>>> bf9c2589f2048793e390ff4d31f979bf6e8ab2c4
 
 YANDEX_MAPS_ACCESS_KEY=secret
 YANDEX_MAPS_BASE_URL=https://api.routing.yandex.net
diff --git a/configs/php/.env.local b/configs/php/.env.local
index f442a9e..010bf9c 100644
--- a/configs/php/.env.local
+++ b/configs/php/.env.local
@@ -16,11 +16,7 @@ FNS_ACCESS_TOKEN=a5639b93fe4e7c9a3f1dd85537e066d36439c352
 
 GOOGLE_MAPS_ACCESS_KEY=AIzaSyBCPl2LcpRvplzLUNVMVLhA3b7k46lTCTg
 
-<<<<<<< HEAD
 NUXT_BASE_URL=staging.dot-dot.ru
-=======
-NUXT_BASE_URL=teste.dot-dot.ru
->>>>>>> bf9c2589f2048793e390ff4d31f979bf6e8ab2c4
 
 ATISU_API_TOKEN=46b599c3ab7f4574b560f48ea005d9f3
 
@@ -54,11 +50,7 @@ ML_CARRIER_SCORING=https://ml.dot-dot.ru/v2/classification/carrier/scoring
 ###< carrier_scoring ###
 
 ###> direction_scoring ###
-<<<<<<< HEAD
 ML_DIRECTION_SCORING_URL=https://ml.dot-dot.ru/v3/classification/direction/confidence
-=======
-ML_DIRECTION_SCORING_URL=https://ml.dot-dot.ru/v2/classification/direction/confidence
->>>>>>> bf9c2589f2048793e390ff4d31f979bf6e8ab2c4
 ###< direction_scoring ###
 	
 ###> direction_recalculate ###
@@ -122,23 +114,17 @@ SOVKOM_API_KEY=AAk6UcV88xCCC26654rM
 SOVKOM_API_URL=https://testout.sovcomins.ru
 ###< SOVKOMTEST###
 
-<<<<<<< HEAD
 ML_REGULAR_DIRECTION_RELEVANCE_CARRIERS_URL=https://ml.dot-dot.ru/v2/schedule/carrier/scoring
 
 ML_REGULAR_DIRECTION_URL=https://ml.dot-dot.ru/v2/schedule/transport
 
 ACCOUNTING_AUDIT_URL="https://crm.dot-dot.ru/TTLBuhreport/hs/TT/reconciliationreport"
 
-=======
-ML_REGULAR_DIRECTION_URL=https://ml.dot-dot.ru/v2/schedule/transport
-
->>>>>>> bf9c2589f2048793e390ff4d31f979bf6e8ab2c4
 ###> YandexTracker ###
 YTRACKER_API_TOKEN="y0_AgAEA7qkKFmeAAjF8AAAAADXovQd6htdkt7LTDW_sNHCz7qV9zdVHaQ"
 YTRACKER_ORGANISATION_ID=355207
 ###< YandexTracker ###
 
-<<<<<<< HEAD
 SMARTCAPTCHA_SERVER_KEY=ysc2_GLQZ8QPaFh0eXqZ5KaRMuRRZOX7qNNMy7P9Mq82V6c4e7b81
 
 ###> sentry/sentry-symfony ###
@@ -168,9 +154,3 @@ USER_TRUST_CHECK_BACKEND=true
 ###< API_KONTUR_FOCUS###
 QUEUE_DSN_USER_TRUST=amqp://ddadmin:Utahth9aeshahgh3saik@rabbitmq:5672/%2f/USER_TRUST
 
-CHROMIUM_BROWSER_SYS_PATH="/usr/bin/chromium-browser"
-=======
-ML_REGULAR_DIRECTION_RELEVANCE_CARRIERS_URL=https://ml.dot-dot.ru/v1/schedule/carrier/scoring
-ML_REGULAR_DIRECTION_CHAIN_URL=https://ml.dot-dot.ru/v1/schedule/chains
-ML_REGULAR_DIRECTION_CHAIN_RELEVANCE_CARRIERS_URL=https://ml.dot-dot.ru/v1/schedule/chains/carrier/scoring
->>>>>>> bf9c2589f2048793e390ff4d31f979bf6e8ab2c4