fix conflicts

package.json

@@ -45,7 +45,6 @@
   "dependencies": {
     "@cliqz/adblocker-circumvention": "^1.12.2",
     "@cliqz/url-parser": "^1.1.3",
-    "base64-js": "^1.3.1",
     "browser-core": "https://github.com/cliqz-oss/browser-core/releases/download/v7.43.7/browser-core-7.43.7.tgz",
     "classnames": "^2.2.5",
     "d3": "^5.15.1",
@@ -67,16 +66,14 @@
     "rsvp": "^4.8.5",
     "spanan": "^2.0.0",
     "ua-parser-js": "^0.7.21",
-    "underscore": "^1.10.2",
-    "whatwg-fetch": "^3.0.0"
+    "underscore": "^1.10.2"
   },
   "devDependencies": {
     "@babel/core": "^7.9.0",
     "@babel/plugin-proposal-class-properties": "^7.8.3",
     "@babel/plugin-proposal-object-rest-spread": "^7.9.0",
     "@babel/plugin-transform-modules-commonjs": "^7.9.0",
     "@babel/preset-react": "^7.9.4",
-    "@babel/register": "^7.9.0",
     "babel-eslint": "^10.1.0",
     "babel-loader": "^8.1.0",
     "clean-webpack-plugin": "^3.0.0",
@@ -106,7 +103,6 @@
     "redux-mock-store": "^1.5.4",
     "sass-loader": "^8.0.2",
     "seamless-immutable": "^7.1.3",
-    "sinon": "^9.0.1",
     "sinon-chrome": "^3.0.1",
     "svg-url-loader": "^5.0.0",
     "underscore-template-loader": "^1.0.0",

test/src/policy.test.js → test/src/Policy.test.js

@@ -1,5 +1,5 @@
 /**
- * /src/classes/Policy.js Unit Tests
+ * Policy.js Unit Tests
  *
  * Ghostery Browser Extension
  * http://www.ghostery.com/