diff --git a/.drone.yml b/.drone.yml
index 7eb65b8..1fddd1b 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -71,13 +71,8 @@ steps:
   - echo "copy docs to ${DRONE_REPO_NAME}"; cp -r ../docs/* .
   - ls
   - echo "# Documentation" >> ./README.md
-<<<<<<< HEAD
   - echo "https://gitea.frontblock.me/fw-docs/${DRONE_REPO_NAME}" >> ./README.md
-  - echo "### Version" >> ./README.md
-=======
-  - echo globals.md >> ./README.md
-  - echo "# Version" >> ./README.md
->>>>>>> b76ff76b2137db313c58c2e6bf8be64ccbbb1b8d
+  - echo "## Version" >> ./README.md
   - echo "${DRONE_TAG}" >> ./README.md
   - echo "" >> ./README.md
   - cat globals.md >> ./README.md
diff --git a/README.md b/README.md
index c48b858..0d04cd0 100644
--- a/README.md
+++ b/README.md
@@ -2,4 +2,4 @@
 
 # How to install
 
-# Quickstart
\ No newline at end of file
+# Quickstart