chore: fix merge conflicts

package.json

@@ -56,10 +56,10 @@
     "semver": "5.4.x",
     "semver-sort": "0.0.x",
     "sinon": "^5.1.1",
-    "source-map-support": "^0.5.6"
+    "source-map-support": "^0.5.9"
   },
   "dependencies": {
     "jsdom": "^11.0.0",
-    "yargs": "^12.0.0"
+    "yargs": "^12.0.2"
   }
 }