diff --git a/docs/en/security_changelog.md b/docs/en/security_changelog.md
index f38f326a917..11e0557a8b8 100644
--- a/docs/en/security_changelog.md
+++ b/docs/en/security_changelog.md
@@ -1,33 +1,21 @@
-<<<<<<< HEAD
 ## Fixed in ClickHouse Release 1.1.54388, 2018-06-28
-=======
-## Fixed in ClickHouse release 1.1.54388, 2018-06-28
->>>>>>> cc433d996c4dc331adb8b694a518c4acf769a993
 
 ### CVE-2018-14668
 "remote" table function allowed arbitrary symbols in "user", "password" and "default_database" fields which led to Cross Protocol Request Forgery Attacks.
 
 Credits: Andrey Krasichkov of Yandex Information Security Team
 
-<<<<<<< HEAD
 ## Fixed in ClickHouse Release 1.1.54390, 2018-07-06
-=======
-## Fixed in ClickHouse release 1.1.54390, 2018-07-06
->>>>>>> cc433d996c4dc331adb8b694a518c4acf769a993
 
 ### CVE-2018-14669
 ClickHouse MySQL client had "LOAD DATA LOCAL INFILE" functionality enabled that allowed a malicious MySQL database read arbitrary files from the connected ClickHouse server.
 
 Credits: Andrey Krasichkov and Evgeny Sidorov of Yandex Information Security Team
 
-<<<<<<< HEAD
 ## Fixed in ClickHouse Release 1.1.54131, 2017-01-10
-=======
-## Fixed in ClickHouse release 1.1.54131, 2017-01-10
->>>>>>> cc433d996c4dc331adb8b694a518c4acf769a993
 
 ### CVE-2018-14670
 
 Incorrect configuration in deb package could lead to unauthorized use of the database.
 
-Credits: the UK's National Cyber Security Centre (NCSC)
\ No newline at end of file
+Credits: the UK's National Cyber Security Centre (NCSC)
diff --git a/docs/toc_en.yml b/docs/toc_en.yml
index 7c9cd30ef02..8b9d4eb262c 100644
--- a/docs/toc_en.yml
+++ b/docs/toc_en.yml
@@ -170,13 +170,7 @@ pages:
   - 'How to write  C++ code': 'development/style.md'
   - 'How to run ClickHouse tests': 'development/tests.md'
 
-<<<<<<< HEAD
 - 'What''s new':
   - 'Roadmap': 'roadmap.md'
   - 'Changelog': 'changelog.md'
   - 'Security changelog': 'security_changelog.md'
-=======
-- 'Roadmap': 'roadmap.md'
-- 'Changelog': 'changelog.md'
-- 'Security changelog': 'security_changelog.md'
->>>>>>> cc433d996c4dc331adb8b694a518c4acf769a993
diff --git a/docs/toc_ru.yml b/docs/toc_ru.yml
index c68cf9c63e7..7f537798f0f 100644
--- a/docs/toc_ru.yml
+++ b/docs/toc_ru.yml
@@ -175,13 +175,7 @@ pages:
   - 'Как писать код на C++': 'development/style.md'
   - 'Как запустить тесты': 'development/tests.md'
 
-<<<<<<< HEAD
 - 'Что нового':
   - 'Changelog': 'changelog.md'
   - 'Security changelog': 'security_changelog.md'
   - 'Roadmap': 'roadmap.md'
-=======
-- 'Roadmap': 'roadmap.md'
-- 'Changelog': 'changelog.md'
-- 'Security changelog': 'security_changelog.md'
->>>>>>> cc433d996c4dc331adb8b694a518c4acf769a993