diff --git a/package.json b/package.json
index 964dc0a..be5aaae 100644
--- a/package.json
+++ b/package.json
@@ -46,5 +46,4 @@
         "lodash": "^4.14.2",
         "semver": "^5.3.0"
     }
->>>>>>> 6a67629635972bebe4583c8046f4ef43d141be44
 }