diff --git a/README.md b/README.md
index 2c69be8e0f0c4c53d4950602392da17e426a8155..2d660187da5db0372e5beee3d997bccdf7a6c17f 100644
--- a/README.md
+++ b/README.md
@@ -88,11 +88,7 @@ You can access a new installation with the login **`root`** and password **`5ive
 
 ## Contributing
 
-<<<<<<< HEAD
-GitLab is an open source project and we are very happy to accept community contributions. Please refer to [Contributing to GitLab page](https://about.gitlab.com/contributing/) for details.
-=======
 GitLab is an open source project and we are very happy to accept community contributions. Please refer to [Contributing to GitLab page](https://about.gitlab.com/contributing/) for more details.
->>>>>>> upstream/master
 
 ## Licensing