diff --git a/README.md b/README.md
index 8255344..1fc62fd 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 # Ritherdon REST
 
+<<<<<<< HEAD
 A package which grabs data from the [Return to
 Ritherdon](http://ritherdon.abbether.net/) project's REST API server.