Fix merge conflict

Author: kristoferbaxter

package.json

@@ -42,11 +42,11 @@
     "ava": "3.3.0",
     "husky": "4.2.3",
     "lint-staged": "10.0.7",
-    "np": "6.0.0",
+    "np": "6.1.0",
     "npm-run-all": "4.1.5",
     "prettier": "1.19.1",
     "rimraf": "3.0.2",
-    "rollup": "1.31.0",
+    "rollup": "1.31.1",
     "shx": "0.3.2",
     "tslib": "1.10.0",
     "typescript": "3.7.5"