Update README.md

f0cdb9f6 · Ray Paik · 55f044ae · f0cdb9f6
Commit f0cdb9f6 authored 6 years ago by Ray Paik
--- 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