diff --git a/README.md b/README.md
index e9212a6..4f28085 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,5 @@
 docker-gitea
 ============
-<<<<<<< HEAD
-
-Docker Gitea Service
---------------------
-=======
->>>>>>> development
 
 Docker Gitea Service
 --------------------