diff --git a/README.md b/README.md
index ce95a0b9..fc7f30b1 100644
--- a/README.md
+++ b/README.md
@@ -69,15 +69,12 @@ Try the [interactive tutorial](http://gun.js.org/think.html) in the browser (**5
    docker build -t myrepo/gundb:v1 .
    docker run -p 8080:8080 myrepo/gundb:v1
 ```
-<<<<<<< HEAD
-=======
  - Or, if you prefer your Docker image with metadata labels (Linux/Mac only):
+ 
  ```bash
    npm run docker
    docker run -p 8080:8080 usenameHere/gun:git
 ```
- 
->>>>>>> 6b78b2ee91fc3442fe0976812db868cdd49b4709
    Then visit [http://localhost:8080](http://localhost:8080) in your browser.
    
 ### [Heroku](https://www.heroku.com/)