Fix missing conflict resolution

Author: pfrazee

app/package.json

@@ -3,17 +3,6 @@
   "productName": "Beaker Browser",
   "description": "An Experimental Peer-to-Peer Web Browser.",
   "homepage": "https://beakerbrowser.com/",
-<<<<<<< HEAD
-  "version": "0.8.10",
-  "author": "Paul Frazee <[email protected]>",
-  "copyright": "© 2019, Blue Link Labs",
-  "main": "background-process.build.js",
-  "dependencies": {
-    "@beaker/core": "github:beakerbrowser/beaker-core",
-    "@beaker/dat-archive-file-diff": "^1.0.0",
-    "anymatch": "^1.3.2",
-    "await-lock": "^1.1.3",
-=======
   "version": "1.0.0-prerelease.1",
   "author": "Blue Link Labs <[email protected]>",
   "copyright": "© 2020, Blue Link Labs",
@@ -25,7 +14,6 @@
     "anymatch": "^2.0.0",
     "await-lock": "^1.2.1",
     "base32.js": "^0.1.0",
->>>>>>> blue-hyperdrive10
     "beaker-error-constants": "^1.4.0",
     "beaker-virtual-fs": "git://github.com/beakerbrowser/beaker-virtual-fs.git#a4b3112df5328e99e63e1786823b3705ab031c77",
     "binary-extensions": "^1.13.1",
@@ -70,33 +58,18 @@
     "markdown-it": "^10.0.0",
     "mime": "^1.4.0",
     "mkdirp": "^0.5.1",
-<<<<<<< HEAD
-    "moment": "^2.22.2",
-    "ms": "^2.0.0",
-    "multicb": "^1.2.2",
-    "nan": "^2.14.0",
-=======
     "moment": "^2.24.0",
     "ms": "^2.1.2",
->>>>>>> blue-hyperdrive10
     "nat-upnp": "^1.1.1",
     "normalize-url": "^3.3.0",
     "once": "^1.4.0",
     "os-locale": "^3.1.0",
     "os-name": "^2.0.1",
-<<<<<<< HEAD
-    "parse-dat-url": "^3.0.1",
-    "pauls-dat-api": "^8.0.1",
-    "pauls-electron-rpc": "^5.0.4",
-    "pauls-word-boundary": "^1.0.0",
-    "pify": "^2.3.0",
-=======
     "page-metadata-parser": "^1.1.3",
     "pauls-dat-api2": "github:beakerbrowser/pauls-dat-api2",
     "pauls-electron-rpc": "^5.0.5",
     "pify": "^3.0.0",
     "pm2": "^4.2.3",
->>>>>>> blue-hyperdrive10
     "pretty-bytes": "^3.0.1",
     "pretty-hash": "^1.0.0",
     "pump": "^3.0.0",