fix merge conflicts

CHANGELOG.md

@@ -1,6 +1,12 @@
 ### GHOSTERY 8.5.0 ()
 
 + Fixes bug in site-specific tracker white-listing (Fixes #519)
++ Update legacy unit tests (#526)
+
+### GHOSTERY 8.4.9 (April 9, 2019)
+
++ Better handling of semantic version comparison (#524)
++ Updates to AMO build script (#524)
 
 ### GHOSTERY 8.4.8 (March 30, 2019)
 

package.json

@@ -91,6 +91,7 @@
     "eslint-plugin-react": "^7.19.0",
     "fs-extra": "^9.0.0",
     "jest": "^25.2.6",
+    "jest-fetch-mock": "^3.0.3",
     "jest-when": "^2.7.1",
     "jsdoc": "^3.6.3",
     "jsonfile": "^6.0.1",