diff --git a/package.json b/package.json
index 2444830e..e8c1e213 100755
--- a/package.json
+++ b/package.json
@@ -1,10 +1,6 @@
 {
   "name": "mopidy-iris",
-<<<<<<< Updated upstream
   "version": "3.17.1",
-=======
-  "version": "3.17.0",
->>>>>>> Stashed changes
   "description": "Mopidy HTTP interface",
   "repository": "https://github.com/jaedb/iris",
   "author": "James Barnsley <james@barnsley.nz>",