diff --git a/README.md b/README.md
index ba789f2fd..dc60451f8 100644
--- a/README.md
+++ b/README.md
@@ -9,21 +9,13 @@ Apache, though we will be expanding it to other platforms.
 
 ## Running the demo code on Ubuntu
 
-<<<<<<< HEAD
-`sudo apt-get install python python-setuptools python-dev python-augeas gcc swig dialog libssl-dev`
-
-`python setup.py install --user`
-
-`sudo ./letsencrypt.py` (or `~/.local/bin/letsencrypt`)
-=======
 ```
 sudo apt-get install python python-setuptools python-virtualenv \
-  python-dev python-augeas gcc swig dialog
+  python-dev python-augeas gcc swig dialog libssl-dev
 virtualenv --system-site-packages venv
 ./venv/bin/python setup.py install
 sudo ./venv/bin/letsencrypt
 ```
->>>>>>> 45ef583a3cebca6159ca2e610b2d8cdd54e5ff6a
 
 Note, that letsencrypt does not yet handle Debian unstable's Apache2
 conf layout.