diff --git a/README.rst b/README.md
similarity index 96%
rename from README.rst
rename to README.md
index 4c97177..a1d9c7f 100644
--- a/README.rst
+++ b/README.md
@@ -28,8 +28,13 @@ Drop the 'webclient' folder in a folder on your Mopidy-system. Then change the s
 Add a line *mopidy.frontends.http.HttpFrontend* to the FRONTENDS section of your settings.py in the .config directory, and set the *HTTP_SERVER_STATIC_DIR* to point to the folder with the files from the web client.
 
 Something like this:
+<<<<<<< HEAD:README.rst
 
 FRONTENDS = ( 
+=======
+```python
+FRONTENDS = (
+>>>>>>> markup fixed I hope:README.md
     'mopidy.frontends.mpd.MpdFrontend',
     'mopidy.frontends.http.HttpFrontend',
     'mopidy.frontends.lastfm.LastfmFrontend',
@@ -37,6 +42,7 @@ FRONTENDS = (
 HTTP_SERVER_HOSTNAME = u'0.0.0.0'
 HTTP_SERVER_PORT = 6680
 HTTP_SERVER_STATIC_DIR = u'/opt/webclient'
+```
 
 Then point your browser (modern, with websockets: recent versions of Firefox, Chrome, Safari and IE10) to the ip-address and port of your device, which you added to the settings.py. e.g. http://192.168.1.5:6680