diff --git a/README.md b/README.md
index 7e35bf8..954cafe 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # kvazar-network webapp
 Web-oriented content exploring platform for Kevacoin Blockchain
 
@@ -45,6 +44,4 @@ location @sef {
 ### examples
 
 #### yggdrasil
-[http://[203:9fd0:95df:54d7:29db:5ee1:fe2d:95c7]](http://[203:9fd0:95df:54d7:29db:5ee1:fe2d:95c7])
-=======
->>>>>>> master
+[http://[203:9fd0:95df:54d7:29db:5ee1:fe2d:95c7]](http://[203:9fd0:95df:54d7:29db:5ee1:fe2d:95c7])
\ No newline at end of file
diff --git a/public/index.php b/public/index.php
index 3970c11..a883419 100644
--- a/public/index.php
+++ b/public/index.php
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <?php
 
 require_once('../config.php');
@@ -169,6 +168,4 @@ if ($rss) {
 
   require_once('index.phtml');
 
-}
-=======
->>>>>>> master
+}
\ No newline at end of file