resolve master conflicts

Author: jeremydaly

package.json

@@ -41,4 +41,4 @@
     "eslint": "^6.8.0",
     "jest": "^24.9.0"
   }
-}
+}