diff --git a/service/management/commands/create_procedures.py b/service/management/commands/create_procedures.py
index 4c16193..978a435 100644
--- a/service/management/commands/create_procedures.py
+++ b/service/management/commands/create_procedures.py
@@ -2,11 +2,7 @@ from django.core.management.base import BaseCommand
 from service.utils import run_sql_command, log_to_telegram
 
 CMD_PIVOT_DIST = """CREATE OR REPLACE VIEW compact_placementpoint AS
-<<<<<<< HEAD
-SELECT id, status, category, age_day, fact, area_id, district_id, prediction_first, prediction_current, doors, flat_cnt, rival_post_cnt, rival_pvz_cnt, target_post_cnt, flats_cnt, tc_cnt, culture_cnt, mfc_cnt, public_stop_cnt, supermarket_cnt, target_dist, metro_dist, geometry FROM service_placementpoint;
-=======
 SELECT id, status, category, age_day, fact, area_id, district_id, prediction_first, prediction_current, doors, flat_cnt, rival_post_cnt, rival_pvz_cnt, target_post_cnt, flats_cnt, tc_cnt, culture_cnt, mfc_cnt, public_stop_cnt, supermarket_cnt, target_dist, metro_dist, geometry, delta_first, delta_current FROM service_placementpoint;
->>>>>>> dev
 CREATE OR REPLACE procedure pivot_dist()
 AS $BODY$
 DECLARE columnNames TEXT;
@@ -73,4 +69,4 @@ class Command(BaseCommand):
             run_sql_command(CMD_PIVOT_DIST_PRE)
             log_to_telegram('prepivot_dist created')
         except Exception as e:
-            log_to_telegram('Error creating views: ' + str(e))
\ No newline at end of file
+            log_to_telegram('Error creating views: ' + str(e))