diff --git a/README.md b/README.md
index 6454ec2b42a0e3ab8cda6cdd9ffa800c9653fdff..f4afed3c37bfaa0dcbae3c8949cc996253d855f1 100644
--- a/README.md
+++ b/README.md
@@ -7,13 +7,8 @@ Pull the latest fenics Docker image
 
 
 ## Create docker container named LDD-TPR with graphical display, share folder `pwd`:
-<<<<<<< HEAD
 
     docker run --dns=129.69.252.252 -it --env HOST_UID=$(id -u $USER) --env HOST_GID=$(id -g $USER) --env DISPLAY=unix$DISPLAY --device /dev/dri --volume /tmp/.X11-unix:/tmp/.X11-unix:rw --volume $(pwd):/home/fenics/shared --name LDD-TPR quay.io/fenicsproject/stable:latest /bin/bash 
-=======
-```
-  docker run --dns=129.69.252.252 -it --env HOST_UID=$(id -u $USER) --env HOST_GID=$(id -g $USER) --env DISPLAY=unix$DISPLAY --device /dev/dri --volume /tmp/.X11-unix:/tmp/.X11-unix:rw --volume $(pwd):/home/fenics/shared --name LDD-TPR quay.io/fenicsproject/stable:latest /bin/bash 
->>>>>>> d18f25ea72f612e4356bfa446899dfa0b6be7017
 
 
 If you want the container do be automatically deleted after exiting add `--rm` option.