diff --git a/README.md b/README.md
index 9b94c8b..7e35bf8 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # kvazar-network webapp
 Web-oriented content exploring platform for Kevacoin Blockchain
 
@@ -45,3 +46,5 @@ location @sef {
 
 #### yggdrasil
 [http://[203:9fd0:95df:54d7:29db:5ee1:fe2d:95c7]](http://[203:9fd0:95df:54d7:29db:5ee1:fe2d:95c7])
+=======
+>>>>>>> master
diff --git a/public/index.php b/public/index.php
old mode 100755
new mode 100644
index 8dd0d04..3970c11
--- a/public/index.php
+++ b/public/index.php
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 <?php
 
 require_once('../config.php');
@@ -169,3 +170,5 @@ if ($rss) {
   require_once('index.phtml');
 
 }
+=======
+>>>>>>> master