diff --git a/package-lock.json b/package-lock.json
index 850715270..332321df7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,42 +5,17 @@
   "requires": true,
   "dependencies": {
     "3box": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-      "version": "1.21.0",
-      "resolved": "https://registry.npmjs.org/3box/-/3box-1.21.0.tgz",
-      "integrity": "sha512-4D8+VeRyXFF6ECaBgPdengxgKRRfA3nlllAVtsZupv8MKpAGkoc/c+5k+XBwWtbozbv3EFY0we/QWpS7Uf1GRA==",
-=======
       "version": "1.20.3",
       "resolved": "https://registry.npmjs.org/3box/-/3box-1.20.3.tgz",
       "integrity": "sha512-aa8cJT4F/x75JL0prcFtdbhtaLslwzb8riqFXDHVitKeVXCsES9KSwyXkP9oo5wi93ACryhmwN1gkLzZ8FuCNg==",
->>>>>>> revert to 3box 1.20.3
       "requires": {
         "3box-orbitdb-plugins": "^2.1.0",
         "3id-blockchain-utils": "^0.4.0",
         "3id-connect": "0.1.0",
         "3id-resolver": "^1.0.0",
         "@babel/runtime": "^7.4.5",
-<<<<<<< dev-2
-        "@ethersproject/hdnode": "5.0.2",
-        "@ethersproject/wallet": "5.0.2",
-=======
-      "version": "1.20.3",
-      "resolved": "https://registry.npmjs.org/3box/-/3box-1.20.3.tgz",
-      "integrity": "sha512-aa8cJT4F/x75JL0prcFtdbhtaLslwzb8riqFXDHVitKeVXCsES9KSwyXkP9oo5wi93ACryhmwN1gkLzZ8FuCNg==",
-      "requires": {
-        "3box-orbitdb-plugins": "^2.1.0",
-        "3id-blockchain-utils": "^0.4.0",
-        "3id-connect": "0.1.0",
-        "3id-resolver": "^1.0.0",
-        "@babel/runtime": "^7.4.5",
-        "@ethersproject/hdnode": "5.0.0-beta.137",
-        "@ethersproject/wallet": "5.0.0-beta.136",
->>>>>>> remove webpack from dependencies
-=======
         "@ethersproject/hdnode": "5.0.0-beta.137",
         "@ethersproject/wallet": "5.0.0-beta.136",
->>>>>>> revert to 3box 1.20.3
         "did-jwt": "^4.2.0",
         "did-resolver": "^1.1.0",
         "events": "^3.0.0",
@@ -53,26 +28,11 @@
         "ipfs-repo": "^3.0.2",
         "is-ipfs": "^1.0.3",
         "js-sha256": "^0.9.0",
-<<<<<<< dev-2
-<<<<<<< dev-2
-        "levelup": "^4.4.0",
-=======
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> revert to 3box 1.20.3
         "libp2p-pubsub": "^0.4.6",
         "lodash.merge": "^4.6.2",
         "muport-did-resolver": "^1.0.2",
         "node-fetch": "^2.6.0",
-<<<<<<< dev-2
-<<<<<<< dev-2
-        "orbit-db": "^0.24.2",
-=======
-        "orbit-db": "^0.24.1",
->>>>>>> remove webpack from dependencies
-=======
         "orbit-db": "^0.24.1",
->>>>>>> revert to 3box 1.20.3
         "orbit-db-cache": "^0.3.0",
         "orbit-db-identity-provider": "^0.3.0",
         "orbit-db-storage-adapter": "^0.5.3",
@@ -82,63 +42,6 @@
         "tweetnacl-util": "^0.15.0"
       },
       "dependencies": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-        "abstract-leveldown": {
-          "version": "6.2.3",
-          "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-6.2.3.tgz",
-          "integrity": "sha512-BsLm5vFMRUrrLeCcRc+G0t2qOaTzpoJQLOubq2XM72eNpjF5UdU5o/5NvlNhx95XHcAvcl8OMXr4mlg/fRgUXQ==",
-          "requires": {
-            "buffer": "^5.5.0",
-            "immediate": "^3.2.3",
-            "level-concat-iterator": "~2.0.0",
-            "level-supports": "~1.0.0",
-            "xtend": "~4.0.0"
-          }
-        },
-        "deferred-leveldown": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-5.3.0.tgz",
-          "integrity": "sha512-a59VOT+oDy7vtAbLRCZwWgxu2BaCfd5Hk7wxJd48ei7I+nsg8Orlb9CLG0PMZienk9BSUKgeAqkO2+Lw+1+Ukw==",
-          "requires": {
-            "abstract-leveldown": "~6.2.1",
-            "inherits": "^2.0.3"
-          }
-        },
-        "level-errors": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/level-errors/-/level-errors-2.0.1.tgz",
-          "integrity": "sha512-UVprBJXite4gPS+3VznfgDSU8PTRuVX0NXwoWW50KLxd2yw4Y1t2JUR5In1itQnudZqRMT9DlAM3Q//9NCjCFw==",
-          "requires": {
-            "errno": "~0.1.1"
-          }
-        },
-        "level-iterator-stream": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/level-iterator-stream/-/level-iterator-stream-4.0.2.tgz",
-          "integrity": "sha512-ZSthfEqzGSOMWoUGhTXdX9jv26d32XJuHz/5YnuHZzH6wldfWMOVwI9TBtKcya4BKTyTt3XVA0A3cF3q5CY30Q==",
-          "requires": {
-            "inherits": "^2.0.4",
-            "readable-stream": "^3.4.0",
-            "xtend": "^4.0.2"
-          }
-        },
-        "levelup": {
-          "version": "4.4.0",
-          "resolved": "https://registry.npmjs.org/levelup/-/levelup-4.4.0.tgz",
-          "integrity": "sha512-94++VFO3qN95cM/d6eBXvd894oJE0w3cInq9USsyQzzoJxmiYzPAocNcuGCPGGjoXqDVJcr3C1jzt1TSjyaiLQ==",
-          "requires": {
-            "deferred-leveldown": "~5.3.0",
-            "level-errors": "~2.0.0",
-            "level-iterator-stream": "~4.0.0",
-            "level-supports": "~1.0.0",
-            "xtend": "~4.0.0"
-          }
-        },
-=======
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> revert to 3box 1.20.3
         "p-timeout": {
           "version": "3.2.0",
           "resolved": "https://registry.npmjs.org/p-timeout/-/p-timeout-3.2.0.tgz",
@@ -147,22 +50,6 @@
             "p-finally": "^1.0.0"
           }
         },
-<<<<<<< dev-2
-<<<<<<< dev-2
-        "readable-stream": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        },
-=======
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> revert to 3box 1.20.3
         "tweetnacl": {
           "version": "1.0.3",
           "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz",
@@ -209,101 +96,6 @@
         }
       }
     },
-<<<<<<< dev-2
-<<<<<<< dev-2
-    "3box-shared-cache": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/3box-shared-cache/-/3box-shared-cache-1.1.0.tgz",
-      "integrity": "sha512-08d5538dNltMX4c+Oev3Bt5cw/gQCmHUQFugF6stWxXhpOPR/ukU4sbmyaP1+bx2IjfP678XWyWWF82KoIkV4Q==",
-      "requires": {
-        "@babel/runtime": "^7.9.2",
-        "abstract-leveldown": "^6.2.2",
-        "datastore-level": "^1.1.0",
-        "level-js": "^4.0.2",
-        "levelup": "^4.3.2",
-        "orbit-db-storage-adapter": "^0.5.3",
-        "postmsg-rpc": "^2.4.0"
-      },
-      "dependencies": {
-        "abstract-leveldown": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-6.3.0.tgz",
-          "integrity": "sha512-TU5nlYgta8YrBMNpc9FwQzRbiXsj49gsALsXadbGHt9CROPzX5fB0rWDR5mtdpOOKa5XqRFpbj1QroPAoPzVjQ==",
-          "requires": {
-            "buffer": "^5.5.0",
-            "immediate": "^3.2.3",
-            "level-concat-iterator": "~2.0.0",
-            "level-supports": "~1.0.0",
-            "xtend": "~4.0.0"
-          }
-        },
-        "deferred-leveldown": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-5.3.0.tgz",
-          "integrity": "sha512-a59VOT+oDy7vtAbLRCZwWgxu2BaCfd5Hk7wxJd48ei7I+nsg8Orlb9CLG0PMZienk9BSUKgeAqkO2+Lw+1+Ukw==",
-          "requires": {
-            "abstract-leveldown": "~6.2.1",
-            "inherits": "^2.0.3"
-          },
-          "dependencies": {
-            "abstract-leveldown": {
-              "version": "6.2.3",
-              "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-6.2.3.tgz",
-              "integrity": "sha512-BsLm5vFMRUrrLeCcRc+G0t2qOaTzpoJQLOubq2XM72eNpjF5UdU5o/5NvlNhx95XHcAvcl8OMXr4mlg/fRgUXQ==",
-              "requires": {
-                "buffer": "^5.5.0",
-                "immediate": "^3.2.3",
-                "level-concat-iterator": "~2.0.0",
-                "level-supports": "~1.0.0",
-                "xtend": "~4.0.0"
-              }
-            }
-          }
-        },
-        "level-errors": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/level-errors/-/level-errors-2.0.1.tgz",
-          "integrity": "sha512-UVprBJXite4gPS+3VznfgDSU8PTRuVX0NXwoWW50KLxd2yw4Y1t2JUR5In1itQnudZqRMT9DlAM3Q//9NCjCFw==",
-          "requires": {
-            "errno": "~0.1.1"
-          }
-        },
-        "level-iterator-stream": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/level-iterator-stream/-/level-iterator-stream-4.0.2.tgz",
-          "integrity": "sha512-ZSthfEqzGSOMWoUGhTXdX9jv26d32XJuHz/5YnuHZzH6wldfWMOVwI9TBtKcya4BKTyTt3XVA0A3cF3q5CY30Q==",
-          "requires": {
-            "inherits": "^2.0.4",
-            "readable-stream": "^3.4.0",
-            "xtend": "^4.0.2"
-          }
-        },
-        "levelup": {
-          "version": "4.4.0",
-          "resolved": "https://registry.npmjs.org/levelup/-/levelup-4.4.0.tgz",
-          "integrity": "sha512-94++VFO3qN95cM/d6eBXvd894oJE0w3cInq9USsyQzzoJxmiYzPAocNcuGCPGGjoXqDVJcr3C1jzt1TSjyaiLQ==",
-          "requires": {
-            "deferred-leveldown": "~5.3.0",
-            "level-errors": "~2.0.0",
-            "level-iterator-stream": "~4.0.0",
-            "level-supports": "~1.0.0",
-            "xtend": "~4.0.0"
-          }
-        },
-        "readable-stream": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        }
-      }
-    },
-=======
->>>>>>> revert to 3box 1.20.3
     "3id-blockchain-utils": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/3id-blockchain-utils/-/3id-blockchain-utils-0.4.1.tgz",
@@ -313,17 +105,6 @@
         "@ethersproject/contracts": "^5.0.1",
         "@ethersproject/providers": "^5.0.4",
         "@ethersproject/wallet": "^5.0.1",
-=======
-    "3id-blockchain-utils": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/3id-blockchain-utils/-/3id-blockchain-utils-0.4.0.tgz",
-      "integrity": "sha512-eaycubt8UxjJ+B1gD480QdS6tnsr/CJ8/z4xeZNgKeaKWgzish1D9MSen0IFIKzBU2YoUtQUzizGtPIYp6VvGg==",
-      "requires": {
-        "@babel/runtime": "^7.9.2",
-        "@ethersproject/contracts": "5.0.0-beta.152",
-        "@ethersproject/providers": "5.0.0-beta.144",
-        "@ethersproject/wallet": "5.0.0-beta.136",
->>>>>>> remove webpack from dependencies
         "js-sha256": "^0.9.0"
       },
       "dependencies": {
@@ -447,10 +228,6 @@
           "dev": true,
           "optional": true
         },
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
->>>>>>> package-lock
         "braces": {
           "version": "2.3.2",
           "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
@@ -470,11 +247,6 @@
             "to-regex": "^3.0.1"
           }
         },
-<<<<<<< dev-2
-=======
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
         "chokidar": {
           "version": "2.1.8",
           "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
@@ -502,10 +274,6 @@
           "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
           "dev": true
         },
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
->>>>>>> package-lock
         "fill-range": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
@@ -519,11 +287,6 @@
             "to-regex-range": "^2.1.0"
           }
         },
-<<<<<<< dev-2
-=======
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
         "fsevents": {
           "version": "1.2.13",
           "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
@@ -568,10 +331,6 @@
             "binary-extensions": "^1.0.0"
           }
         },
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
->>>>>>> package-lock
         "is-buffer": {
           "version": "1.1.6",
           "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
@@ -599,11 +358,6 @@
             "is-buffer": "^1.1.5"
           }
         },
-<<<<<<< dev-2
-=======
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
         "make-dir": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
@@ -643,10 +397,6 @@
           "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
           "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
           "dev": true
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
->>>>>>> package-lock
         },
         "to-regex-range": {
           "version": "2.1.1",
@@ -658,11 +408,6 @@
             "is-number": "^3.0.0",
             "repeat-string": "^1.6.1"
           }
-<<<<<<< dev-2
-=======
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
         }
       }
     },
@@ -3489,21 +3234,9 @@
       "integrity": "sha512-b0JQb10Lie07iW2/9uKCQSrXif262d6zfYBstCLLJUk0JVA+7o/yLDg5p2+GkjgJbmodjHozIXs4Bi34RRhL8Q=="
     },
     "@dorgtech/daocreator-lib-experimental": {
-<<<<<<< dev-2
-<<<<<<< dev-2
       "version": "1.1.9",
       "resolved": "https://registry.npmjs.org/@dorgtech/daocreator-lib-experimental/-/daocreator-lib-experimental-1.1.9.tgz",
       "integrity": "sha512-Amf5naYsqdGjPJnhaSRkf90G8V8Uyn59Il2q0AfAG3DDQPbcoxLRIIcg7stGnQ9/2LqmZ3OsldW6hz16fyjwYg==",
-=======
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/@dorgtech/daocreator-lib-experimental/-/daocreator-lib-experimental-1.1.7.tgz",
-      "integrity": "sha512-xQP+SQF7mB12CmNejJp2pP5vWGsJTWB61+665H/zPj7m5Z3F9PIZTu1xX/Z9xhukYShXG+e0/294/X3IoVIgPw==",
->>>>>>> remove webpack from dependencies
-=======
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/@dorgtech/daocreator-lib-experimental/-/daocreator-lib-experimental-1.1.9.tgz",
-      "integrity": "sha512-Amf5naYsqdGjPJnhaSRkf90G8V8Uyn59Il2q0AfAG3DDQPbcoxLRIIcg7stGnQ9/2LqmZ3OsldW6hz16fyjwYg==",
->>>>>>> merge conflict errors
       "requires": {
         "bn.js": "^5.0.0",
         "csv": "^5.1.2",
@@ -3521,8 +3254,6 @@
       }
     },
     "@dorgtech/daocreator-ui-experimental": {
-<<<<<<< dev-2
-<<<<<<< dev-2
       "version": "1.1.12",
       "resolved": "https://registry.npmjs.org/@dorgtech/daocreator-ui-experimental/-/daocreator-ui-experimental-1.1.12.tgz",
       "integrity": "sha512-IP6dWyOAks1XlaRyRs/530PC8lPNNQNAfn2wro8csCJFkiR27IemiTmTWr1mNab7D3QRUaB8sB4mb6MBbk937A==",
@@ -3530,24 +3261,6 @@
         "@date-io/core": "^1.3.6",
         "@date-io/date-fns": "^1.3.11",
         "@dorgtech/daocreator-lib-experimental": "1.1.9",
-=======
-      "version": "1.1.10",
-      "resolved": "https://registry.npmjs.org/@dorgtech/daocreator-ui-experimental/-/daocreator-ui-experimental-1.1.10.tgz",
-      "integrity": "sha512-4d09id0SZtm2Bf/K2WAk4lcW8Kd0ltqP0bNnYFuCpSRdf/fFnTtQLHKYo3vxRCx5EI39dx+IxosJFDpt4VfyoA==",
-      "requires": {
-        "@date-io/core": "^1.3.6",
-        "@date-io/date-fns": "^1.3.11",
-        "@dorgtech/daocreator-lib-experimental": "1.1.7",
->>>>>>> remove webpack from dependencies
-=======
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/@dorgtech/daocreator-ui-experimental/-/daocreator-ui-experimental-1.1.12.tgz",
-      "integrity": "sha512-IP6dWyOAks1XlaRyRs/530PC8lPNNQNAfn2wro8csCJFkiR27IemiTmTWr1mNab7D3QRUaB8sB4mb6MBbk937A==",
-      "requires": {
-        "@date-io/core": "^1.3.6",
-        "@date-io/date-fns": "^1.3.11",
-        "@dorgtech/daocreator-lib-experimental": "1.1.9",
->>>>>>> merge conflict errors
         "@fortawesome/fontawesome-free": "^5.11.2",
         "@material-ui/core": "^4.7.2",
         "@material-ui/pickers": "3.2.2",
@@ -3772,7 +3485,6 @@
       }
     },
     "@ethersproject/contracts": {
-<<<<<<< dev-2
       "version": "5.0.2",
       "resolved": "https://registry.npmjs.org/@ethersproject/contracts/-/contracts-5.0.2.tgz",
       "integrity": "sha512-Ud3oW8mBNIWE+WHRjvwVEwfvshn7lfYWSSKG0fPSb6baRN9mLOoNguX+VIv3W5Sne9w2utnBmxLF2ESXitw64A==",
@@ -3804,22 +3516,6 @@
             "@ethersproject/strings": "^5.0.0"
           }
         }
-=======
-      "version": "5.0.0-beta.152",
-      "resolved": "https://registry.npmjs.org/@ethersproject/contracts/-/contracts-5.0.0-beta.152.tgz",
-      "integrity": "sha512-sYdSNqmX59uH1eDqQvR4QlYaslQ80zqvrWaugUeSqz97/EyZ2aVF61R/BJ+mKLnv/smwerkNlGKCjxubmdmM/w==",
-      "requires": {
-        "@ethersproject/abi": ">=5.0.0-beta.153",
-        "@ethersproject/abstract-provider": ">=5.0.0-beta.139",
-        "@ethersproject/abstract-signer": ">=5.0.0-beta.142",
-        "@ethersproject/address": ">=5.0.0-beta.134",
-        "@ethersproject/bignumber": ">=5.0.0-beta.138",
-        "@ethersproject/bytes": ">=5.0.0-beta.137",
-        "@ethersproject/constants": ">=5.0.0-beta.133",
-        "@ethersproject/logger": ">=5.0.0-beta.137",
-        "@ethersproject/properties": ">=5.0.0-beta.140",
-        "@ethersproject/transactions": ">=5.0.0-beta.135"
->>>>>>> remove webpack from dependencies
       }
     },
     "@ethersproject/hash": {
@@ -3834,16 +3530,9 @@
       }
     },
     "@ethersproject/hdnode": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/@ethersproject/hdnode/-/hdnode-5.0.2.tgz",
-      "integrity": "sha512-QAUI5tfseTFqv00Vnbwzofqse81wN9TaL+x5GufTHIHJXgVdguxU+l39E3VYDCmO+eVAA6RCn5dJgeyra+PU2g==",
-=======
       "version": "5.0.0-beta.137",
       "resolved": "https://registry.npmjs.org/@ethersproject/hdnode/-/hdnode-5.0.0-beta.137.tgz",
       "integrity": "sha512-TDe57vm/tndbaSKi/NRgC0uAp4uVr60LurTAw+u6mG5ihZg9mlYgr15GxOXWTRiJfa3V3kQD8VsTpzlNMYHViw==",
->>>>>>> revert to 3box 1.20.3
       "requires": {
         "@ethersproject/abstract-signer": ">=5.0.0-beta.132",
         "@ethersproject/basex": ">=5.0.0-beta.127",
@@ -3863,30 +3552,6 @@
       "version": "5.0.4",
       "resolved": "https://registry.npmjs.org/@ethersproject/json-wallets/-/json-wallets-5.0.4.tgz",
       "integrity": "sha512-jqtb+X3rJXWG/w+Qyr7vq1V+fdc5jiLlyc6akwI3SQIHTfcuuyF+eZRd9u2/455urNwV3nuCsnrgxs2NrtHHIw==",
-=======
-      "version": "5.0.0-beta.137",
-      "resolved": "https://registry.npmjs.org/@ethersproject/hdnode/-/hdnode-5.0.0-beta.137.tgz",
-      "integrity": "sha512-TDe57vm/tndbaSKi/NRgC0uAp4uVr60LurTAw+u6mG5ihZg9mlYgr15GxOXWTRiJfa3V3kQD8VsTpzlNMYHViw==",
-      "requires": {
-        "@ethersproject/abstract-signer": ">=5.0.0-beta.132",
-        "@ethersproject/basex": ">=5.0.0-beta.127",
-        "@ethersproject/bignumber": ">=5.0.0-beta.130",
-        "@ethersproject/bytes": ">=5.0.0-beta.129",
-        "@ethersproject/logger": ">=5.0.0-beta.129",
-        "@ethersproject/pbkdf2": ">=5.0.0-beta.127",
-        "@ethersproject/properties": ">=5.0.0-beta.131",
-        "@ethersproject/sha2": ">=5.0.0-beta.129",
-        "@ethersproject/signing-key": ">=5.0.0-beta.129",
-        "@ethersproject/strings": ">=5.0.0-beta.130",
-        "@ethersproject/transactions": ">=5.0.0-beta.128",
-        "@ethersproject/wordlists": ">=5.0.0-beta.128"
-      }
-    },
-    "@ethersproject/json-wallets": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/@ethersproject/json-wallets/-/json-wallets-5.0.3.tgz",
-      "integrity": "sha512-VfDXn5ylugkfiM6SrvQfhX9oAHVU5dsNpRw8PjjTCn4k5E2JuVRO5A8sibkYXDhcBmRISZIWqclIxka6FI/chg==",
->>>>>>> remove webpack from dependencies
       "requires": {
         "@ethersproject/abstract-signer": "^5.0.0",
         "@ethersproject/address": "^5.0.0",
@@ -3903,11 +3568,6 @@
         "scrypt-js": "3.0.1"
       },
       "dependencies": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
-=======
->>>>>>> revert to 3box 1.20.3
         "@ethersproject/hdnode": {
           "version": "5.0.2",
           "resolved": "https://registry.npmjs.org/@ethersproject/hdnode/-/hdnode-5.0.2.tgz",
@@ -3927,10 +3587,6 @@
             "@ethersproject/wordlists": "^5.0.0"
           }
         },
-<<<<<<< dev-2
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> revert to 3box 1.20.3
         "scrypt-js": {
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/scrypt-js/-/scrypt-js-3.0.1.tgz",
@@ -3978,7 +3634,6 @@
       }
     },
     "@ethersproject/providers": {
-<<<<<<< dev-2
       "version": "5.0.5",
       "resolved": "https://registry.npmjs.org/@ethersproject/providers/-/providers-5.0.5.tgz",
       "integrity": "sha512-ZR3yFg/m8qDl7317yXOHE7tKeGfoyZIZ/imhVC4JqAH+SX1rb6bdZcSjhJfet7rLmnJSsnYLTgIiVIT85aVLgg==",
@@ -4006,27 +3661,6 @@
           "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.3.tgz",
           "integrity": "sha512-HTDl9G9hbkNDk98naoR/cHDws7+EyYMOdL1BmjsZXRUjf7d+MficC4B7HLUPlSiho0vg+CWKrGIt/VJBd1xunQ=="
         }
-=======
-      "version": "5.0.0-beta.144",
-      "resolved": "https://registry.npmjs.org/@ethersproject/providers/-/providers-5.0.0-beta.144.tgz",
-      "integrity": "sha512-r4WIDGlI2lcrUkldqfhUsegVL3LB08l0s8Ri1sPQyEVIB01ZDCvxxWk2dohTWSQHDAa7Nkym9EgKps6Ij3MEpQ==",
-      "requires": {
-        "@ethersproject/abstract-provider": ">=5.0.0-beta.131",
-        "@ethersproject/abstract-signer": ">=5.0.0-beta.132",
-        "@ethersproject/address": ">=5.0.0-beta.128",
-        "@ethersproject/bignumber": ">=5.0.0-beta.130",
-        "@ethersproject/bytes": ">=5.0.0-beta.129",
-        "@ethersproject/constants": ">=5.0.0-beta.128",
-        "@ethersproject/hash": ">=5.0.0-beta.128",
-        "@ethersproject/logger": ">=5.0.0-beta.129",
-        "@ethersproject/networks": ">=5.0.0-beta.129",
-        "@ethersproject/properties": ">=5.0.0-beta.131",
-        "@ethersproject/random": ">=5.0.0-beta.128",
-        "@ethersproject/rlp": ">=5.0.0-beta.126",
-        "@ethersproject/strings": ">=5.0.0-beta.130",
-        "@ethersproject/transactions": ">=5.0.0-beta.128",
-        "@ethersproject/web": ">=5.0.0-beta.129"
->>>>>>> remove webpack from dependencies
       }
     },
     "@ethersproject/random": {
@@ -4106,16 +3740,9 @@
       }
     },
     "@ethersproject/wallet": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/@ethersproject/wallet/-/wallet-5.0.2.tgz",
-      "integrity": "sha512-gg86ynLV5k5caNnYpJoYc6WyIUHKMTjOITCk5zXGyVbbkXE07y/fGql4A51W0C6mWkeb5Mzz8AKqzHZECdH30w==",
-=======
       "version": "5.0.0-beta.136",
       "resolved": "https://registry.npmjs.org/@ethersproject/wallet/-/wallet-5.0.0-beta.136.tgz",
       "integrity": "sha512-ORK5/zCf0XCh7lcTKDXXUm18Crm4kjM3k/J6HRzs56LCHDlDlQbWRnfubq7uj6ZH6/FEIuf5F2J8YvOVpoqcSA==",
->>>>>>> revert to 3box 1.20.3
       "requires": {
         "@ethersproject/abstract-provider": ">=5.0.0-beta.131",
         "@ethersproject/abstract-signer": ">=5.0.0-beta.132",
@@ -4141,35 +3768,6 @@
       "requires": {
         "@ethersproject/base64": "^5.0.0",
         "@ethersproject/bytes": "^5.0.0",
-=======
-      "version": "5.0.0-beta.136",
-      "resolved": "https://registry.npmjs.org/@ethersproject/wallet/-/wallet-5.0.0-beta.136.tgz",
-      "integrity": "sha512-ORK5/zCf0XCh7lcTKDXXUm18Crm4kjM3k/J6HRzs56LCHDlDlQbWRnfubq7uj6ZH6/FEIuf5F2J8YvOVpoqcSA==",
-      "requires": {
-        "@ethersproject/abstract-provider": ">=5.0.0-beta.131",
-        "@ethersproject/abstract-signer": ">=5.0.0-beta.132",
-        "@ethersproject/address": ">=5.0.0-beta.128",
-        "@ethersproject/bignumber": ">=5.0.0-beta.130",
-        "@ethersproject/bytes": ">=5.0.0-beta.129",
-        "@ethersproject/hash": ">=5.0.0-beta.128",
-        "@ethersproject/hdnode": ">=5.0.0-beta.130",
-        "@ethersproject/json-wallets": ">=5.0.0-beta.129",
-        "@ethersproject/keccak256": ">=5.0.0-beta.127",
-        "@ethersproject/logger": ">=5.0.0-beta.129",
-        "@ethersproject/properties": ">=5.0.0-beta.131",
-        "@ethersproject/random": ">=5.0.0-beta.128",
-        "@ethersproject/signing-key": ">=5.0.0-beta.129",
-        "@ethersproject/transactions": ">=5.0.0-beta.128",
-        "@ethersproject/wordlists": ">=5.0.0-beta.128"
-      }
-    },
-    "@ethersproject/web": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/@ethersproject/web/-/web-5.0.2.tgz",
-      "integrity": "sha512-uAlcxdrAWB9PXZlb5NPzbOOt5/m9EJP2c6eLw15/PXPkNNohEIKvdXXOWdcQgTjZ0pcAaD/9mnJ6HXg7NbqXiw==",
-      "requires": {
-        "@ethersproject/base64": "^5.0.0",
->>>>>>> remove webpack from dependencies
         "@ethersproject/logger": "^5.0.0",
         "@ethersproject/properties": "^5.0.0",
         "@ethersproject/strings": "^5.0.0"
@@ -6429,21 +6027,9 @@
       }
     },
     "@portis/web3": {
-<<<<<<< dev-2
-<<<<<<< dev-2
       "version": "2.0.0-beta.57",
       "resolved": "https://registry.npmjs.org/@portis/web3/-/web3-2.0.0-beta.57.tgz",
       "integrity": "sha512-OYmt0a171AJECYT/vTkPb4uc1x7xFASMfn+MN3EAjo7DRhY8WfTAMNoMJDhuFARRLC7an2HrRIsT7D4q9GNrnQ==",
-=======
-      "version": "2.0.0-beta.56",
-      "resolved": "https://registry.npmjs.org/@portis/web3/-/web3-2.0.0-beta.56.tgz",
-      "integrity": "sha512-likffGhd9lKMOiI657rV62NM0ewxLBOQGPoUJPIX2rCx25P9FQ+4CiqEsqCUeofaNra6q+/4EPZgSscNWHa6BQ==",
->>>>>>> remove webpack from dependencies
-=======
-      "version": "2.0.0-beta.57",
-      "resolved": "https://registry.npmjs.org/@portis/web3/-/web3-2.0.0-beta.57.tgz",
-      "integrity": "sha512-OYmt0a171AJECYT/vTkPb4uc1x7xFASMfn+MN3EAjo7DRhY8WfTAMNoMJDhuFARRLC7an2HrRIsT7D4q9GNrnQ==",
->>>>>>> package-lock
       "requires": {
         "@portis/web3-provider-engine": "1.1.0",
         "ethereumjs-util": "5.2.0",
@@ -7188,21 +6774,6 @@
             "color-convert": "^2.0.1"
           }
         },
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
-        "braces": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-          "dev": true,
-          "requires": {
-            "fill-range": "^7.0.1"
-          }
-        },
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
         "chalk": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
@@ -7276,32 +6847,6 @@
             "escape-string-regexp": "^1.0.5"
           }
         },
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
-        "fill-range": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-          "dev": true,
-          "requires": {
-            "to-regex-range": "^5.0.1"
-          }
-        },
-        "find-cache-dir": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz",
-          "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==",
-          "dev": true,
-          "requires": {
-            "commondir": "^1.0.1",
-            "make-dir": "^3.0.2",
-            "pkg-dir": "^4.1.0"
-          }
-        },
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
         "find-up": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
@@ -7394,18 +6939,6 @@
           "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
           "dev": true
         },
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
-        "is-number": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-          "dev": true
-        },
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
         "json5": {
           "version": "2.1.3",
           "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz",
@@ -7424,21 +6957,6 @@
             "p-locate": "^4.1.0"
           }
         },
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
-        "make-dir": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-          "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-          "dev": true,
-          "requires": {
-            "semver": "^6.0.0"
-          }
-        },
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
         "micromatch": {
           "version": "4.0.2",
           "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz",
@@ -7470,21 +6988,6 @@
           "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
           "dev": true
         },
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
-        "pkg-dir": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-          "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-          "dev": true,
-          "requires": {
-            "find-up": "^4.0.0"
-          }
-        },
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
         "postcss": {
           "version": "7.0.32",
           "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.32.tgz",
@@ -7690,21 +7193,6 @@
             "has-flag": "^4.0.0"
           }
         },
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
-        "to-regex-range": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-          "dev": true,
-          "requires": {
-            "is-number": "^7.0.0"
-          }
-        },
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
         "type-fest": {
           "version": "0.11.0",
           "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
@@ -8358,21 +7846,9 @@
       }
     },
     "@toruslabs/http-helpers": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/@toruslabs/http-helpers/-/http-helpers-1.3.4.tgz",
-      "integrity": "sha512-2Hm34F3GOwg41jEaZs1rVF4b+SGwC2mPeR7WhkkkM1cQNlXyCtcgLNLqlCVrww9e6pfBCZ2h3aEQVw+p4cT4fw==",
-=======
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/@toruslabs/http-helpers/-/http-helpers-1.3.3.tgz",
-      "integrity": "sha512-bM0NyFCA+K8DOlhciDLIUQ05/VzuM9lgdwnNSr/gociRhPWbUDc8PkSVKYT3MshXj/ZtLvN9UvcTvY1hddN5UQ==",
->>>>>>> remove webpack from dependencies
-=======
       "version": "1.3.4",
       "resolved": "https://registry.npmjs.org/@toruslabs/http-helpers/-/http-helpers-1.3.4.tgz",
       "integrity": "sha512-2Hm34F3GOwg41jEaZs1rVF4b+SGwC2mPeR7WhkkkM1cQNlXyCtcgLNLqlCVrww9e6pfBCZ2h3aEQVw+p4cT4fw==",
->>>>>>> package-lock
       "requires": {
         "deepmerge": "^4.2.2",
         "loglevel": "^1.6.8"
@@ -8419,10 +7895,6 @@
           "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
           "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="
         },
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
->>>>>>> package-lock
         "eth-json-rpc-errors": {
           "version": "2.0.2",
           "resolved": "https://registry.npmjs.org/eth-json-rpc-errors/-/eth-json-rpc-errors-2.0.2.tgz",
@@ -8431,11 +7903,6 @@
             "fast-safe-stringify": "^2.0.6"
           }
         },
-<<<<<<< dev-2
-=======
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
         "is-stream": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
@@ -8461,50 +7928,18 @@
       }
     },
     "@toruslabs/torus.js": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-<<<<<<< dev-2
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/@toruslabs/torus.js/-/torus.js-2.2.4.tgz",
-      "integrity": "sha512-xFDWWGHl9gXkduEysSIWvWR5KPJnYDq9Y1cA7v2oIf0/cevldD03iafg2JeP2m3P8LcyPkYS6stCcDStv24TUg==",
-      "requires": {
-        "@toruslabs/eccrypto": "^1.1.3",
-        "@toruslabs/http-helpers": "^1.3.4",
-=======
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/@toruslabs/torus.js/-/torus.js-2.2.3.tgz",
-      "integrity": "sha512-GryzcqY5/iumfCy0LNUIdjo9iKYRHof6UQzHYK/u2oc4XtCWVKnwk+6OZfuYeurEoW/VDYU+b1MEa7qqOKV9RQ==",
-      "requires": {
-        "@toruslabs/eccrypto": "^1.1.3",
-        "@toruslabs/http-helpers": "^1.3.3",
->>>>>>> remove webpack from dependencies
-=======
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/@toruslabs/torus.js/-/torus.js-2.2.4.tgz",
-      "integrity": "sha512-xFDWWGHl9gXkduEysSIWvWR5KPJnYDq9Y1cA7v2oIf0/cevldD03iafg2JeP2m3P8LcyPkYS6stCcDStv24TUg==",
-=======
       "version": "2.2.5",
       "resolved": "https://registry.npmjs.org/@toruslabs/torus.js/-/torus.js-2.2.5.tgz",
       "integrity": "sha512-fxrIQmtNo4p3uEy5KdiIrZiB32KGPtaV70PoPg/vQB4IL/gjrQSYSIcC0VyP04yBfjHLccJe/HKOhlofpKcjAg==",
->>>>>>> package-lock
       "requires": {
         "@toruslabs/eccrypto": "^1.1.4",
         "@toruslabs/http-helpers": "^1.3.4",
->>>>>>> package-lock
         "bn.js": "^5.1.2",
         "elliptic": "^6.5.3",
         "json-stable-stringify": "^1.0.1",
         "loglevel": "^1.6.8",
         "memory-cache": "^0.2.0",
-<<<<<<< dev-2
-<<<<<<< dev-2
-        "web3-utils": "^1.2.11"
-=======
-        "web3-utils": "^1.2.9"
->>>>>>> remove webpack from dependencies
-=======
         "web3-utils": "^1.2.11"
->>>>>>> package-lock
       },
       "dependencies": {
         "bn.js": {
@@ -8741,21 +8176,9 @@
       }
     },
     "@types/jquery": {
-<<<<<<< dev-2
-<<<<<<< dev-2
       "version": "3.5.1",
       "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.1.tgz",
       "integrity": "sha512-Tyctjh56U7eX2b9udu3wG853ASYP0uagChJcQJXLUXEU6C/JiW5qt5dl8ao01VRj1i5pgXPAf8f1mq4+FDLRQg==",
-=======
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.0.tgz",
-      "integrity": "sha512-C7qQUjpMWDUNYQRTXsP5nbYYwCwwgy84yPgoTT7fPN69NH92wLeCtFaMsWeolJD1AF/6uQw3pYt62rzv83sMmw==",
->>>>>>> remove webpack from dependencies
-=======
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.1.tgz",
-      "integrity": "sha512-Tyctjh56U7eX2b9udu3wG853ASYP0uagChJcQJXLUXEU6C/JiW5qt5dl8ao01VRj1i5pgXPAf8f1mq4+FDLRQg==",
->>>>>>> package-lock
       "dev": true,
       "requires": {
         "@types/sizzle": "*"
@@ -9205,27 +8628,9 @@
       }
     },
     "@types/underscore": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-<<<<<<< dev-2
-      "version": "1.10.17",
-      "resolved": "https://registry.npmjs.org/@types/underscore/-/underscore-1.10.17.tgz",
-      "integrity": "sha512-puV6Kw1HU/WKxyJgSkC0cQCv0UmNWZrjNIWqseDBOg4G3fE6yYXHWGI+9Sjha94FytbVChXPltmQRzCdFt932Q==",
-=======
-      "version": "1.10.14",
-      "resolved": "https://registry.npmjs.org/@types/underscore/-/underscore-1.10.14.tgz",
-      "integrity": "sha512-VE20ZYf38nmOU1lU0wpQBWcGPlskfKK8uU8AN1UIz5PjxT2YM7HTF0iUA85iGJnbQ3tZweqIfQqmLgLMtP27YQ==",
->>>>>>> remove webpack from dependencies
-=======
-      "version": "1.10.17",
-      "resolved": "https://registry.npmjs.org/@types/underscore/-/underscore-1.10.17.tgz",
-      "integrity": "sha512-puV6Kw1HU/WKxyJgSkC0cQCv0UmNWZrjNIWqseDBOg4G3fE6yYXHWGI+9Sjha94FytbVChXPltmQRzCdFt932Q==",
->>>>>>> package-lock
-=======
       "version": "1.10.20",
       "resolved": "https://registry.npmjs.org/@types/underscore/-/underscore-1.10.20.tgz",
       "integrity": "sha512-UiLhTLijxQ6sKP2aQbextgPVovrrxqXFP+UO/l90o1Ytguc85UWtbHcmnZDRe8hQ2MHeA+BJglgbYsgtll/zyw==",
->>>>>>> package-lock
       "dev": true
     },
     "@types/web3": {
@@ -9267,21 +8672,9 @@
       "dev": true
     },
     "@types/webpack-sources": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-1.4.2.tgz",
-      "integrity": "sha512-77T++JyKow4BQB/m9O96n9d/UUHWLQHlcqXb9Vsf4F1+wKNrrlWNFPDLKNT92RJnCSL6CieTc+NDXtCVZswdTw==",
-=======
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-1.4.1.tgz",
-      "integrity": "sha512-B/RJcbpMp1/od7KADJlW/jeXTEau6NYmhWo+hB29cEfRriYK9SRlH8sY4hI9Au7nrP95Z5MumGvIEiEBHMxoWA==",
->>>>>>> remove webpack from dependencies
-=======
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-1.4.2.tgz",
       "integrity": "sha512-77T++JyKow4BQB/m9O96n9d/UUHWLQHlcqXb9Vsf4F1+wKNrrlWNFPDLKNT92RJnCSL6CieTc+NDXtCVZswdTw==",
->>>>>>> package-lock
       "dev": true,
       "requires": {
         "@types/node": "*",
@@ -9328,48 +8721,12 @@
       "integrity": "sha512-te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg=="
     },
     "@typescript-eslint/eslint-plugin": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-<<<<<<< dev-2
-<<<<<<< dev-2
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.7.1.tgz",
-      "integrity": "sha512-3DB9JDYkMrc8Au00rGFiJLK2Ja9CoMP6Ut0sHsXp3ZtSugjNxvSSHTnKLfo4o+QmjYBJqEznDqsG1zj4F2xnsg==",
-      "dev": true,
-      "requires": {
-        "@typescript-eslint/experimental-utils": "3.7.1",
-=======
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.7.0.tgz",
-      "integrity": "sha512-4OEcPON3QIx0ntsuiuFP/TkldmBGXf0uKxPQlGtS/W2F3ndYm8Vgdpj/woPJkzUc65gd3iR+qi3K8SDQP/obFg==",
-      "dev": true,
-      "requires": {
-        "@typescript-eslint/experimental-utils": "3.7.0",
->>>>>>> remove webpack from dependencies
-=======
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.7.1.tgz",
-      "integrity": "sha512-3DB9JDYkMrc8Au00rGFiJLK2Ja9CoMP6Ut0sHsXp3ZtSugjNxvSSHTnKLfo4o+QmjYBJqEznDqsG1zj4F2xnsg==",
-      "dev": true,
-      "requires": {
-        "@typescript-eslint/experimental-utils": "3.7.1",
->>>>>>> package-lock
-=======
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.8.0.tgz",
-      "integrity": "sha512-lFb4VCDleFSR+eo4Ew+HvrJ37ZH1Y9ZyE+qyP7EiwBpcCVxwmUc5PAqhShCQ8N8U5vqYydm74nss+a0wrrCErw==",
-      "dev": true,
-      "requires": {
-        "@typescript-eslint/experimental-utils": "3.8.0",
->>>>>>> package-lock
-=======
       "version": "3.9.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.9.0.tgz",
       "integrity": "sha512-UD6b4p0/hSe1xdTvRCENSx7iQ+KR6ourlZFfYuPC7FlXEzdHuLPrEmuxZ23b2zW96KJX9Z3w05GE/wNOiEzrVg==",
       "dev": true,
       "requires": {
         "@typescript-eslint/experimental-utils": "3.9.0",
->>>>>>> 3box fix for identity-wallet
         "debug": "^4.1.1",
         "functional-red-black-tree": "^1.0.1",
         "regexpp": "^3.0.0",
@@ -9410,49 +8767,6 @@
       }
     },
     "@typescript-eslint/experimental-utils": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-<<<<<<< dev-2
-<<<<<<< dev-2
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.7.1.tgz",
-      "integrity": "sha512-TqE97pv7HrqWcGJbLbZt1v59tcqsSVpWTOf1AqrWK7n8nok2sGgVtYRuGXeNeLw3wXlLEbY1MKP3saB2HsO/Ng==",
-      "dev": true,
-      "requires": {
-        "@types/json-schema": "^7.0.3",
-        "@typescript-eslint/types": "3.7.1",
-        "@typescript-eslint/typescript-estree": "3.7.1",
-=======
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.7.0.tgz",
-      "integrity": "sha512-xpfXXAfZqhhqs5RPQBfAFrWDHoNxD5+sVB5A46TF58Bq1hRfVROrWHcQHHUM9aCBdy9+cwATcvCbRg8aIRbaHQ==",
-      "dev": true,
-      "requires": {
-        "@types/json-schema": "^7.0.3",
-        "@typescript-eslint/types": "3.7.0",
-        "@typescript-eslint/typescript-estree": "3.7.0",
->>>>>>> remove webpack from dependencies
-=======
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.7.1.tgz",
-      "integrity": "sha512-TqE97pv7HrqWcGJbLbZt1v59tcqsSVpWTOf1AqrWK7n8nok2sGgVtYRuGXeNeLw3wXlLEbY1MKP3saB2HsO/Ng==",
-      "dev": true,
-      "requires": {
-        "@types/json-schema": "^7.0.3",
-        "@typescript-eslint/types": "3.7.1",
-        "@typescript-eslint/typescript-estree": "3.7.1",
->>>>>>> package-lock
-=======
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.8.0.tgz",
-      "integrity": "sha512-o8T1blo1lAJE0QDsW7nSyvZHbiDzQDjINJKyB44Z3sSL39qBy5L10ScI/XwDtaiunoyKGLiY9bzRk4YjsUZl8w==",
-      "dev": true,
-      "requires": {
-        "@types/json-schema": "^7.0.3",
-        "@typescript-eslint/types": "3.8.0",
-        "@typescript-eslint/typescript-estree": "3.8.0",
->>>>>>> package-lock
-=======
       "version": "3.9.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.9.0.tgz",
       "integrity": "sha512-/vSHUDYizSOhrOJdjYxPNGfb4a3ibO8zd4nUKo/QBFOmxosT3cVUV7KIg8Dwi6TXlr667G7YPqFK9+VSZOorNA==",
@@ -9461,7 +8775,6 @@
         "@types/json-schema": "^7.0.3",
         "@typescript-eslint/types": "3.9.0",
         "@typescript-eslint/typescript-estree": "3.9.0",
->>>>>>> 3box fix for identity-wallet
         "eslint-scope": "^5.0.0",
         "eslint-utils": "^2.0.0"
       },
@@ -9479,53 +8792,6 @@
       }
     },
     "@typescript-eslint/parser": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-<<<<<<< dev-2
-<<<<<<< dev-2
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.7.1.tgz",
-      "integrity": "sha512-W4QV/gXvfIsccN8225784LNOorcm7ch68Fi3V4Wg7gmkWSQRKevO4RrRqWo6N/Z/myK1QAiGgeaXN57m+R/8iQ==",
-      "dev": true,
-      "requires": {
-        "@types/eslint-visitor-keys": "^1.0.0",
-        "@typescript-eslint/experimental-utils": "3.7.1",
-        "@typescript-eslint/types": "3.7.1",
-        "@typescript-eslint/typescript-estree": "3.7.1",
-=======
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.7.0.tgz",
-      "integrity": "sha512-2LZauVUt7jAWkcIW7djUc3kyW+fSarNEuM3RF2JdLHR9BfX/nDEnyA4/uWz0wseoWVZbDXDF7iF9Jc342flNqQ==",
-      "dev": true,
-      "requires": {
-        "@types/eslint-visitor-keys": "^1.0.0",
-        "@typescript-eslint/experimental-utils": "3.7.0",
-        "@typescript-eslint/types": "3.7.0",
-        "@typescript-eslint/typescript-estree": "3.7.0",
->>>>>>> remove webpack from dependencies
-=======
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.7.1.tgz",
-      "integrity": "sha512-W4QV/gXvfIsccN8225784LNOorcm7ch68Fi3V4Wg7gmkWSQRKevO4RrRqWo6N/Z/myK1QAiGgeaXN57m+R/8iQ==",
-      "dev": true,
-      "requires": {
-        "@types/eslint-visitor-keys": "^1.0.0",
-        "@typescript-eslint/experimental-utils": "3.7.1",
-        "@typescript-eslint/types": "3.7.1",
-        "@typescript-eslint/typescript-estree": "3.7.1",
->>>>>>> package-lock
-=======
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.8.0.tgz",
-      "integrity": "sha512-u5vjOBaCsnMVQOvkKCXAmmOhyyMmFFf5dbkM3TIbg3MZ2pyv5peE4gj81UAbTHwTOXEwf7eCQTUMKrDl/+qGnA==",
-      "dev": true,
-      "requires": {
-        "@types/eslint-visitor-keys": "^1.0.0",
-        "@typescript-eslint/experimental-utils": "3.8.0",
-        "@typescript-eslint/types": "3.8.0",
-        "@typescript-eslint/typescript-estree": "3.8.0",
->>>>>>> package-lock
-=======
       "version": "3.9.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.9.0.tgz",
       "integrity": "sha512-rDHOKb6uW2jZkHQniUQVZkixQrfsZGUCNWWbKWep4A5hGhN5dLHMUCNAWnC4tXRlHedXkTDptIpxs6e4Pz8UfA==",
@@ -9535,47 +8801,13 @@
         "@typescript-eslint/experimental-utils": "3.9.0",
         "@typescript-eslint/types": "3.9.0",
         "@typescript-eslint/typescript-estree": "3.9.0",
->>>>>>> 3box fix for identity-wallet
         "eslint-visitor-keys": "^1.1.0"
       }
     },
     "@typescript-eslint/types": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-<<<<<<< dev-2
-<<<<<<< dev-2
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-3.7.1.tgz",
-      "integrity": "sha512-PZe8twm5Z4b61jt7GAQDor6KiMhgPgf4XmUb9zdrwTbgtC/Sj29gXP1dws9yEn4+aJeyXrjsD9XN7AWFhmnUfg==",
-      "dev": true
-    },
-    "@typescript-eslint/typescript-estree": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.7.1.tgz",
-      "integrity": "sha512-m97vNZkI08dunYOr2lVZOHoyfpqRs0KDpd6qkGaIcLGhQ2WPtgHOd/eVbsJZ0VYCQvupKrObAGTOvk3tfpybYA==",
-      "dev": true,
-      "requires": {
-        "@typescript-eslint/types": "3.7.1",
-        "@typescript-eslint/visitor-keys": "3.7.1",
-=======
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-3.7.0.tgz",
-      "integrity": "sha512-reCaK+hyKkKF+itoylAnLzFeNYAEktB0XVfSQvf0gcVgpz1l49Lt6Vo9x4MVCCxiDydA0iLAjTF/ODH0pbfnpg==",
-=======
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-3.7.1.tgz",
-      "integrity": "sha512-PZe8twm5Z4b61jt7GAQDor6KiMhgPgf4XmUb9zdrwTbgtC/Sj29gXP1dws9yEn4+aJeyXrjsD9XN7AWFhmnUfg==",
->>>>>>> package-lock
-=======
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-3.8.0.tgz",
-      "integrity": "sha512-8kROmEQkv6ss9kdQ44vCN1dTrgu4Qxrd2kXr10kz2NP5T8/7JnEfYNxCpPkArbLIhhkGLZV3aVMplH1RXQRF7Q==",
->>>>>>> package-lock
-=======
       "version": "3.9.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-3.9.0.tgz",
       "integrity": "sha512-rb6LDr+dk9RVVXO/NJE8dT1pGlso3voNdEIN8ugm4CWM5w5GimbThCMiMl4da1t5u3YwPWEwOnKAULCZgBtBHg==",
->>>>>>> 3box fix for identity-wallet
       "dev": true
     },
     "@typescript-eslint/typescript-estree": {
@@ -9584,24 +8816,8 @@
       "integrity": "sha512-N+158NKgN4rOmWVfvKOMoMFV5n8XxAliaKkArm/sOypzQ0bUL8MSnOEBW3VFIeffb/K5ce/cAV0yYhR7U4ALAA==",
       "dev": true,
       "requires": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-<<<<<<< dev-2
-        "@typescript-eslint/types": "3.7.0",
-        "@typescript-eslint/visitor-keys": "3.7.0",
->>>>>>> remove webpack from dependencies
-=======
-        "@typescript-eslint/types": "3.7.1",
-        "@typescript-eslint/visitor-keys": "3.7.1",
->>>>>>> package-lock
-=======
-        "@typescript-eslint/types": "3.8.0",
-        "@typescript-eslint/visitor-keys": "3.8.0",
->>>>>>> package-lock
-=======
         "@typescript-eslint/types": "3.9.0",
         "@typescript-eslint/visitor-keys": "3.9.0",
->>>>>>> 3box fix for identity-wallet
         "debug": "^4.1.1",
         "glob": "^7.1.6",
         "is-glob": "^4.0.1",
@@ -9643,33 +8859,9 @@
       }
     },
     "@typescript-eslint/visitor-keys": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-<<<<<<< dev-2
-<<<<<<< dev-2
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-3.7.1.tgz",
-      "integrity": "sha512-xn22sQbEya+Utj2IqJHGLA3i1jDzR43RzWupxojbSWnj3nnPLavaQmWe5utw03CwYao3r00qzXfgJMGNkrzrAA==",
-=======
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-3.7.0.tgz",
-      "integrity": "sha512-k5PiZdB4vklUpUX4NBncn5RBKty8G3ihTY+hqJsCdMuD0v4jofI5xuqwnVcWxfv6iTm2P/dfEa2wMUnsUY8ODw==",
->>>>>>> remove webpack from dependencies
-=======
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-3.7.1.tgz",
-      "integrity": "sha512-xn22sQbEya+Utj2IqJHGLA3i1jDzR43RzWupxojbSWnj3nnPLavaQmWe5utw03CwYao3r00qzXfgJMGNkrzrAA==",
->>>>>>> package-lock
-=======
-      "version": "3.8.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-3.8.0.tgz",
-      "integrity": "sha512-gfqQWyVPpT9NpLREXNR820AYwgz+Kr1GuF3nf1wxpHD6hdxI62tq03ToomFnDxY0m3pUB39IF7sil7D5TQexLA==",
->>>>>>> package-lock
-=======
       "version": "3.9.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-3.9.0.tgz",
       "integrity": "sha512-O1qeoGqDbu0EZUC/MZ6F1WHTIzcBVhGqDj3LhTnj65WUA548RXVxUHbYhAW9bZWfb2rnX9QsbbP5nmeJ5Z4+ng==",
->>>>>>> 3box fix for identity-wallet
       "dev": true,
       "requires": {
         "eslint-visitor-keys": "^1.1.0"
@@ -9786,44 +8978,14 @@
       }
     },
     "@wdio/cli": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-<<<<<<< dev-2
-      "version": "6.3.6",
-      "resolved": "https://registry.npmjs.org/@wdio/cli/-/cli-6.3.6.tgz",
-      "integrity": "sha512-KYM/PdtUk1Hqt9RuynNDUgQi5SEZmCVdUQt0z7tJTKhF4pEoRx0qBTqSS9l6jPtCRIRMP0ue8F+2iklILjpLkw==",
-=======
-      "version": "6.3.5",
-      "resolved": "https://registry.npmjs.org/@wdio/cli/-/cli-6.3.5.tgz",
-      "integrity": "sha512-xRmfYn+H9f1286W/2ZRkRapwdIuQCZPSbH8j0BEdoq6+kuBTY6SKwe+s+VBtc4Xe1aCQpL9aCUnLxyF45vDdTg==",
->>>>>>> remove webpack from dependencies
-=======
-      "version": "6.3.6",
-      "resolved": "https://registry.npmjs.org/@wdio/cli/-/cli-6.3.6.tgz",
-      "integrity": "sha512-KYM/PdtUk1Hqt9RuynNDUgQi5SEZmCVdUQt0z7tJTKhF4pEoRx0qBTqSS9l6jPtCRIRMP0ue8F+2iklILjpLkw==",
->>>>>>> package-lock
-=======
       "version": "6.4.0",
       "resolved": "https://registry.npmjs.org/@wdio/cli/-/cli-6.4.0.tgz",
       "integrity": "sha512-QNkAtoucBs9SKmOEDsfdJl8KhH8WgWBvaxngSLR/q/oY2IVpEzzscmXWOJOoXtMUkrQQ9waGwcagMmPToNUluQ==",
->>>>>>> package-lock
       "dev": true,
       "requires": {
         "@wdio/config": "6.1.14",
         "@wdio/logger": "6.0.16",
-<<<<<<< dev-2
-<<<<<<< dev-2
-<<<<<<< dev-2
-        "@wdio/utils": "6.3.6",
-=======
-        "@wdio/utils": "6.3.0",
->>>>>>> remove webpack from dependencies
-=======
-        "@wdio/utils": "6.3.6",
->>>>>>> package-lock
-=======
         "@wdio/utils": "6.4.0",
->>>>>>> package-lock
         "async-exit-hook": "^2.0.1",
         "chalk": "^4.0.0",
         "chokidar": "^3.0.0",
@@ -9836,19 +8998,7 @@
         "lodash.union": "^4.6.0",
         "mkdirp": "^1.0.4",
         "recursive-readdir": "^2.2.2",
-<<<<<<< dev-2
-<<<<<<< dev-2
-<<<<<<< dev-2
-        "webdriverio": "6.3.6",
-=======
-        "webdriverio": "6.3.5",
->>>>>>> remove webpack from dependencies
-=======
-        "webdriverio": "6.3.6",
->>>>>>> package-lock
-=======
         "webdriverio": "6.4.0",
->>>>>>> package-lock
         "yargs": "^15.0.1",
         "yarn-install": "^1.0.0"
       },
@@ -10145,36 +9295,12 @@
       }
     },
     "@wdio/dot-reporter": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-<<<<<<< dev-2
-      "version": "6.3.6",
-      "resolved": "https://registry.npmjs.org/@wdio/dot-reporter/-/dot-reporter-6.3.6.tgz",
-      "integrity": "sha512-UdJIJIEhQNPmuKLBb+20QDyt0zmXZ94CIwFJt9wkv8+B/AAvK7Hp9QeBlXJEUowxItaE9WXbi+8mnGegomWelA==",
-=======
       "version": "6.4.0",
       "resolved": "https://registry.npmjs.org/@wdio/dot-reporter/-/dot-reporter-6.4.0.tgz",
       "integrity": "sha512-Iv6PBQSQ5Ep78Vv2UYXcQVBW4oH6cxYTelLon4MnS9Hl1x8Z67KrOdT0HNxdgNYfh/bpxX820Rx70h4ZWqgD0g==",
->>>>>>> package-lock
       "dev": true,
       "requires": {
         "@wdio/reporter": "6.3.6",
-=======
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/@wdio/dot-reporter/-/dot-reporter-6.3.0.tgz",
-      "integrity": "sha512-tZ5g9BZRnNHQ5s+BvZ7jUxkI6tCaCH+8tnRCgsaKlO3JLzuaKP9o79fX5EsB21R9vBHerjDGgyNtSNMadjd+3w==",
-      "dev": true,
-      "requires": {
-        "@wdio/reporter": "6.3.0",
->>>>>>> remove webpack from dependencies
-=======
-      "version": "6.3.6",
-      "resolved": "https://registry.npmjs.org/@wdio/dot-reporter/-/dot-reporter-6.3.6.tgz",
-      "integrity": "sha512-UdJIJIEhQNPmuKLBb+20QDyt0zmXZ94CIwFJt9wkv8+B/AAvK7Hp9QeBlXJEUowxItaE9WXbi+8mnGegomWelA==",
-      "dev": true,
-      "requires": {
-        "@wdio/reporter": "6.3.6",
->>>>>>> package-lock
         "chalk": "^4.0.0"
       },
       "dependencies": {
@@ -10225,38 +9351,6 @@
       }
     },
     "@wdio/local-runner": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-<<<<<<< dev-2
-      "version": "6.3.6",
-      "resolved": "https://registry.npmjs.org/@wdio/local-runner/-/local-runner-6.3.6.tgz",
-      "integrity": "sha512-40qyjnfdgM3lYo29FTwD21Jl+bQZJr0BC4YauxRF8C/g/SMuc+NyU3v5vCKXFsz3leMvgqCucurDYT81W4IwuA==",
-      "dev": true,
-      "requires": {
-        "@wdio/logger": "6.0.16",
-        "@wdio/repl": "6.3.6",
-        "@wdio/runner": "6.3.6",
-=======
-      "version": "6.3.5",
-      "resolved": "https://registry.npmjs.org/@wdio/local-runner/-/local-runner-6.3.5.tgz",
-      "integrity": "sha512-n9/OOmRuXeq2/B2vyLvyWhRX4BV1lv1hyHianL3tIXP4PhHLyPCWvFBZJsZIZiQGYZnKm7BIq5niZenHewUahg==",
-      "dev": true,
-      "requires": {
-        "@wdio/logger": "6.0.16",
-        "@wdio/repl": "6.3.0",
-        "@wdio/runner": "6.3.5",
->>>>>>> remove webpack from dependencies
-=======
-      "version": "6.3.6",
-      "resolved": "https://registry.npmjs.org/@wdio/local-runner/-/local-runner-6.3.6.tgz",
-      "integrity": "sha512-40qyjnfdgM3lYo29FTwD21Jl+bQZJr0BC4YauxRF8C/g/SMuc+NyU3v5vCKXFsz3leMvgqCucurDYT81W4IwuA==",
-      "dev": true,
-      "requires": {
-        "@wdio/logger": "6.0.16",
-        "@wdio/repl": "6.3.6",
-        "@wdio/runner": "6.3.6",
->>>>>>> package-lock
-=======
       "version": "6.4.0",
       "resolved": "https://registry.npmjs.org/@wdio/local-runner/-/local-runner-6.4.0.tgz",
       "integrity": "sha512-El4MGktVfgilk2+Q8Lxd3fUIsTG4n2U1+duIOMJA8vqjPPulL9Tp/axIxrKGhGfLUHXbFfFJdNmP7k5xsuvaog==",
@@ -10265,7 +9359,6 @@
         "@wdio/logger": "6.0.16",
         "@wdio/repl": "6.4.0",
         "@wdio/runner": "6.4.0",
->>>>>>> package-lock
         "async-exit-hook": "^2.0.1",
         "stream-buffers": "^3.0.2"
       }
@@ -10344,35 +9437,6 @@
       }
     },
     "@wdio/mocha-framework": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-<<<<<<< dev-2
-      "version": "6.3.6",
-      "resolved": "https://registry.npmjs.org/@wdio/mocha-framework/-/mocha-framework-6.3.6.tgz",
-      "integrity": "sha512-lNcm5fZYnJTiduPFLmRQ4NWV7o/EJd+y1rXVFNNK24oI4lhTdnX87tvnCnco1dkcZRSSv1fS90PBPD7HXkAwWQ==",
-      "dev": true,
-      "requires": {
-        "@wdio/logger": "6.0.16",
-        "@wdio/utils": "6.3.6",
-=======
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/@wdio/mocha-framework/-/mocha-framework-6.3.0.tgz",
-      "integrity": "sha512-3lLvzhDYWwOYmiJAjr2fm/nENq6g6uUOtkIeEQFp1kDyBQkDsH1PXGdFklQbRiQT8mAqOPhx1kvXrCA/XpWl7g==",
-      "dev": true,
-      "requires": {
-        "@wdio/logger": "6.0.16",
-        "@wdio/utils": "6.3.0",
->>>>>>> remove webpack from dependencies
-=======
-      "version": "6.3.6",
-      "resolved": "https://registry.npmjs.org/@wdio/mocha-framework/-/mocha-framework-6.3.6.tgz",
-      "integrity": "sha512-lNcm5fZYnJTiduPFLmRQ4NWV7o/EJd+y1rXVFNNK24oI4lhTdnX87tvnCnco1dkcZRSSv1fS90PBPD7HXkAwWQ==",
-      "dev": true,
-      "requires": {
-        "@wdio/logger": "6.0.16",
-        "@wdio/utils": "6.3.6",
->>>>>>> package-lock
-=======
       "version": "6.4.0",
       "resolved": "https://registry.npmjs.org/@wdio/mocha-framework/-/mocha-framework-6.4.0.tgz",
       "integrity": "sha512-xRN4pblLuTBkfK/mj2wWs/R/Xkzv5I/FGxdj/X/CNlbCu+llYSjJ5acXFA06klT/LymLgV468a9b6zK42g9rVQ==",
@@ -10380,43 +9444,16 @@
       "requires": {
         "@wdio/logger": "6.0.16",
         "@wdio/utils": "6.4.0",
->>>>>>> package-lock
         "expect-webdriverio": "^1.1.5",
         "mocha": "^8.0.1"
       }
     },
     "@wdio/protocols": {
-<<<<<<< dev-2
-<<<<<<< dev-2
       "version": "6.3.6",
       "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-6.3.6.tgz",
       "integrity": "sha512-cocBRkv5sYUBxXResuxskQhIkKgDgE/yAtgMGR5wXLrtG/sMpZ2HVy6LOcOeARidAaRwbav80M2ZHjTCjPn53w==",
       "dev": true
     },
-    "@wdio/repl": {
-      "version": "6.3.6",
-      "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-6.3.6.tgz",
-      "integrity": "sha512-FDvYacQxSmrrBYsscpcJuz8HGEq2TDosJkrMOyJ6q+Voi5wisvVF8fIiLEvwvL+Uraj1gHwXABFD2YlZZJqFKw==",
-      "dev": true,
-      "requires": {
-        "@wdio/utils": "6.3.6"
-      }
-    },
-    "@wdio/reporter": {
-      "version": "6.3.6",
-      "resolved": "https://registry.npmjs.org/@wdio/reporter/-/reporter-6.3.6.tgz",
-      "integrity": "sha512-u+iaIZS1oAyHUyXxzyr+pySi2gaFe7u1v6HD1vW6C0sNvICK+wFco4fOSpatizPnVSjuEamgI7ErngBdzUiUag==",
-=======
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-6.3.0.tgz",
-      "integrity": "sha512-1GKzfyCTLW5WkFd3W7NLACih+zNWU7c8kFurbCQXDK1ko1obqJEs7ZjBr85q5XqMWburdks5rDjyml2iEB2LBg==",
-=======
-      "version": "6.3.6",
-      "resolved": "https://registry.npmjs.org/@wdio/protocols/-/protocols-6.3.6.tgz",
-      "integrity": "sha512-cocBRkv5sYUBxXResuxskQhIkKgDgE/yAtgMGR5wXLrtG/sMpZ2HVy6LOcOeARidAaRwbav80M2ZHjTCjPn53w==",
->>>>>>> package-lock
-      "dev": true
-    },
     "@wdio/repl": {
       "version": "6.4.0",
       "resolved": "https://registry.npmjs.org/@wdio/repl/-/repl-6.4.0.tgz",
@@ -10427,16 +9464,9 @@
       }
     },
     "@wdio/reporter": {
-<<<<<<< dev-2
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/@wdio/reporter/-/reporter-6.3.0.tgz",
-      "integrity": "sha512-vbwjJvSKZUtsWtQMhuVqT7ZP6RIFAH4+ienjNwW30QPDi38OujZgxC2ZqRoZKsxck6cfTgkxrXfNaxHN0/LHKg==",
->>>>>>> remove webpack from dependencies
-=======
       "version": "6.3.6",
       "resolved": "https://registry.npmjs.org/@wdio/reporter/-/reporter-6.3.6.tgz",
       "integrity": "sha512-u+iaIZS1oAyHUyXxzyr+pySi2gaFe7u1v6HD1vW6C0sNvICK+wFco4fOSpatizPnVSjuEamgI7ErngBdzUiUag==",
->>>>>>> package-lock
       "dev": true,
       "requires": {
         "fs-extra": "^9.0.0"
@@ -10473,60 +9503,18 @@
       }
     },
     "@wdio/runner": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-<<<<<<< dev-2
-      "version": "6.3.6",
-      "resolved": "https://registry.npmjs.org/@wdio/runner/-/runner-6.3.6.tgz",
-      "integrity": "sha512-k2EcQ4QIWWSpOA0OaBKpLxt4bSwsVk+BjsgT9TIRp4Ao+DR+AL4nLn6C11NjCnbdoGdFZ5WAsaqZPdy4zmm7ZA==",
-=======
-      "version": "6.3.5",
-      "resolved": "https://registry.npmjs.org/@wdio/runner/-/runner-6.3.5.tgz",
-      "integrity": "sha512-jAM/9xI3i4svcQZmry6TAnpfTenZGyvKCegyaJTL3HvUBWkTVE9Y4ecYiZeLOSYp5DTqXaQnoyu6Cv9JgGvTHw==",
->>>>>>> remove webpack from dependencies
-=======
-      "version": "6.3.6",
-      "resolved": "https://registry.npmjs.org/@wdio/runner/-/runner-6.3.6.tgz",
-      "integrity": "sha512-k2EcQ4QIWWSpOA0OaBKpLxt4bSwsVk+BjsgT9TIRp4Ao+DR+AL4nLn6C11NjCnbdoGdFZ5WAsaqZPdy4zmm7ZA==",
->>>>>>> package-lock
-=======
       "version": "6.4.0",
       "resolved": "https://registry.npmjs.org/@wdio/runner/-/runner-6.4.0.tgz",
       "integrity": "sha512-XjAUkIYWAPKimgRKVJ/fP6BCj07lYP8/Vtkd5fMDaoWESpj7bRIvJXiI+DSVnMYtAWFTjSZ3kDhq9h3fhEnMaQ==",
->>>>>>> package-lock
       "dev": true,
       "requires": {
         "@wdio/config": "6.1.14",
         "@wdio/logger": "6.0.16",
-<<<<<<< dev-2
-<<<<<<< dev-2
-<<<<<<< dev-2
-        "@wdio/utils": "6.3.6",
-        "deepmerge": "^4.0.0",
-        "gaze": "^1.1.2",
-        "webdriver": "6.3.6",
-        "webdriverio": "6.3.6"
-=======
-        "@wdio/utils": "6.3.0",
-        "deepmerge": "^4.0.0",
-        "gaze": "^1.1.2",
-        "webdriver": "6.3.5",
-        "webdriverio": "6.3.5"
->>>>>>> remove webpack from dependencies
-=======
-        "@wdio/utils": "6.3.6",
-        "deepmerge": "^4.0.0",
-        "gaze": "^1.1.2",
-        "webdriver": "6.3.6",
-        "webdriverio": "6.3.6"
->>>>>>> package-lock
-=======
         "@wdio/utils": "6.4.0",
         "deepmerge": "^4.0.0",
         "gaze": "^1.1.2",
         "webdriver": "6.4.0",
         "webdriverio": "6.4.0"
->>>>>>> package-lock
       },
       "dependencies": {
         "deepmerge": {
@@ -10580,36 +9568,12 @@
       }
     },
     "@wdio/spec-reporter": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-<<<<<<< dev-2
-      "version": "6.3.6",
-      "resolved": "https://registry.npmjs.org/@wdio/spec-reporter/-/spec-reporter-6.3.6.tgz",
-      "integrity": "sha512-RO/Bc8NIGE8VScrmJz8VNFtIAFoW02xOgFGD8J4LgObQ/cKyn/v6vxCCRgGv27DHYW4j0/rtrem/+z/hgU/C9w==",
-=======
       "version": "6.4.0",
       "resolved": "https://registry.npmjs.org/@wdio/spec-reporter/-/spec-reporter-6.4.0.tgz",
       "integrity": "sha512-nY7tr6nRDkJEsT0Yv/ZJVaDT2KjtQqd/X+X7cFHEMvy13NguOOdC/+WQyilR+JrT5JSJZySRDdu0gm7A8DSVGA==",
->>>>>>> package-lock
       "dev": true,
       "requires": {
         "@wdio/reporter": "6.3.6",
-=======
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/@wdio/spec-reporter/-/spec-reporter-6.3.0.tgz",
-      "integrity": "sha512-JGZAMcqiOloOw6xcIT5O8GORVaww6kslgH5kZGydVQyoNBj1ZKoLdEjqq2jklJsge1xsscdYdW9u9kMHwm25iA==",
-      "dev": true,
-      "requires": {
-        "@wdio/reporter": "6.3.0",
->>>>>>> remove webpack from dependencies
-=======
-      "version": "6.3.6",
-      "resolved": "https://registry.npmjs.org/@wdio/spec-reporter/-/spec-reporter-6.3.6.tgz",
-      "integrity": "sha512-RO/Bc8NIGE8VScrmJz8VNFtIAFoW02xOgFGD8J4LgObQ/cKyn/v6vxCCRgGv27DHYW4j0/rtrem/+z/hgU/C9w==",
-      "dev": true,
-      "requires": {
-        "@wdio/reporter": "6.3.6",
->>>>>>> package-lock
         "chalk": "^4.0.0",
         "easy-table": "^1.1.1",
         "pretty-ms": "^7.0.0"
@@ -10662,27 +9626,9 @@
       }
     },
     "@wdio/utils": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-<<<<<<< dev-2
-      "version": "6.3.6",
-      "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-6.3.6.tgz",
-      "integrity": "sha512-qY/RR/t2YCu+4V5wDlPnuouRiO38BRq0ubMipjRGDixytK6VPa5CfosVqDOlrsXrIBrGHCQct1aGLk7KiugmiQ==",
-=======
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-6.3.0.tgz",
-      "integrity": "sha512-PbeC5fpieamgSAHf7S58MAyraGU1qKxnHdfGMG+ZIWiIo73oo4j/57CcH6ZawQ3YC1wEc/5q+VXg7N5hvqhJOQ==",
->>>>>>> remove webpack from dependencies
-=======
-      "version": "6.3.6",
-      "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-6.3.6.tgz",
-      "integrity": "sha512-qY/RR/t2YCu+4V5wDlPnuouRiO38BRq0ubMipjRGDixytK6VPa5CfosVqDOlrsXrIBrGHCQct1aGLk7KiugmiQ==",
->>>>>>> package-lock
-=======
       "version": "6.4.0",
       "resolved": "https://registry.npmjs.org/@wdio/utils/-/utils-6.4.0.tgz",
       "integrity": "sha512-sAVBbgQjUmvbvkQ/EyWIUSDoebtiZewmf6wb6Pt6EZfaTm4hul30Txd+IXfazhuxp701PskwufkMWzrQIXhpKw==",
->>>>>>> package-lock
       "dev": true,
       "requires": {
         "@wdio/logger": "6.0.16"
@@ -10972,21 +9918,9 @@
       },
       "dependencies": {
         "@types/node": {
-<<<<<<< dev-2
-<<<<<<< dev-2
           "version": "14.0.27",
           "resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.27.tgz",
           "integrity": "sha512-kVrqXhbclHNHGu9ztnAwSncIgJv/FaxmzXJvGXNdcCpV1b8u1/Mi6z6m0vwy0LzKeXFTPLH0NzwmoJ3fNCIq0g=="
-=======
-          "version": "14.0.26",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.26.tgz",
-          "integrity": "sha512-W+fpe5s91FBGE0pEa0lnqGLL4USgpLgs4nokw16SrBBco/gQxuua7KnArSEOd5iaMqbbSHV10vUDkJYJJqpXKA=="
->>>>>>> remove webpack from dependencies
-=======
-          "version": "14.0.27",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.27.tgz",
-          "integrity": "sha512-kVrqXhbclHNHGu9ztnAwSncIgJv/FaxmzXJvGXNdcCpV1b8u1/Mi6z6m0vwy0LzKeXFTPLH0NzwmoJ3fNCIq0g=="
->>>>>>> package-lock
         }
       }
     },
@@ -11196,21 +10130,9 @@
       "dev": true
     },
     "ajv-keywords": {
-<<<<<<< dev-2
-<<<<<<< dev-2
       "version": "3.5.2",
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
       "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-=======
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.1.tgz",
-      "integrity": "sha512-KWcq3xN8fDjSB+IMoh2VaXVhRI0BBGxoYp3rx7Pkb6z0cFjYR9Q9l4yZqqals0/zsioCmocC5H6UvsGD4MoIBA==",
->>>>>>> remove webpack from dependencies
-=======
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
->>>>>>> package-lock
       "dev": true
     },
     "alphanum-sort": {
@@ -11746,45 +10668,18 @@
       "dev": true
     },
     "archiver": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/archiver/-/archiver-5.0.0.tgz",
-      "integrity": "sha512-AEWhJz6Yi6hWtN1Sqy/H4sZo/lLMJ/NftXxGaDy/TnOMmmjsRaZc/Ts+U4BsPoBQkuunTN6t8hk7iU9A+HBxLw==",
-=======
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/archiver/-/archiver-4.0.2.tgz",
-      "integrity": "sha512-B9IZjlGwaxF33UN4oPbfBkyA4V1SxNLeIhR1qY8sRXSsbdUkEHrrOvwlYFPx+8uQeCe9M+FG6KgO+imDmQ79CQ==",
->>>>>>> remove webpack from dependencies
-=======
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/archiver/-/archiver-5.0.0.tgz",
       "integrity": "sha512-AEWhJz6Yi6hWtN1Sqy/H4sZo/lLMJ/NftXxGaDy/TnOMmmjsRaZc/Ts+U4BsPoBQkuunTN6t8hk7iU9A+HBxLw==",
->>>>>>> package-lock
       "dev": true,
       "requires": {
         "archiver-utils": "^2.1.0",
         "async": "^3.2.0",
         "buffer-crc32": "^0.2.1",
-<<<<<<< dev-2
-<<<<<<< dev-2
         "readable-stream": "^3.6.0",
         "readdir-glob": "^1.0.0",
         "tar-stream": "^2.1.2",
         "zip-stream": "^4.0.0"
-=======
-        "glob": "^7.1.6",
-=======
->>>>>>> package-lock
-        "readable-stream": "^3.6.0",
-        "readdir-glob": "^1.0.0",
-        "tar-stream": "^2.1.2",
-<<<<<<< dev-2
-        "zip-stream": "^3.0.1"
->>>>>>> remove webpack from dependencies
-=======
-        "zip-stream": "^4.0.0"
->>>>>>> package-lock
       },
       "dependencies": {
         "async": {
@@ -11943,10 +10838,6 @@
       "dev": true,
       "requires": {
         "is-number": "^3.0.0"
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
->>>>>>> package-lock
       },
       "dependencies": {
         "is-buffer": {
@@ -11973,11 +10864,6 @@
             "is-buffer": "^1.1.5"
           }
         }
-<<<<<<< dev-2
-=======
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
       }
     },
     "arr-union": {
@@ -12814,10 +11700,6 @@
         "schema-utils": "^2.6.5"
       },
       "dependencies": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
->>>>>>> package-lock
         "find-cache-dir": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
@@ -12839,11 +11721,6 @@
             "semver": "^5.6.0"
           }
         },
-<<<<<<< dev-2
-=======
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
         "mkdirp": {
           "version": "0.5.5",
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
@@ -12869,21 +11746,12 @@
             "ajv": "^6.12.2",
             "ajv-keywords": "^3.4.1"
           }
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
->>>>>>> package-lock
         },
         "semver": {
           "version": "5.7.1",
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
           "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
           "dev": true
-<<<<<<< dev-2
-=======
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
         }
       }
     },
@@ -13078,27 +11946,9 @@
       }
     },
     "babel-plugin-styled-components": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-<<<<<<< dev-2
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-1.11.0.tgz",
-      "integrity": "sha512-X+3II2OfDD7AKEKzJfqJBhR48FfVHsImTETtYvZtJrGiBQmRP8UQKOCQL+hOhvHP0l4Fuwqk2bMCXAd3YADpwA==",
-=======
-      "version": "1.10.7",
-      "resolved": "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-1.10.7.tgz",
-      "integrity": "sha512-MBMHGcIA22996n9hZRf/UJLVVgkEOITuR2SvjHLb5dSTUyR4ZRGn+ngITapes36FI3WLxZHfRhkA1ffHxihOrg==",
->>>>>>> remove webpack from dependencies
-=======
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-1.11.0.tgz",
-      "integrity": "sha512-X+3II2OfDD7AKEKzJfqJBhR48FfVHsImTETtYvZtJrGiBQmRP8UQKOCQL+hOhvHP0l4Fuwqk2bMCXAd3YADpwA==",
->>>>>>> package-lock
-=======
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-1.11.1.tgz",
       "integrity": "sha512-YwrInHyKUk1PU3avIRdiLyCpM++18Rs1NgyMXEAQC33rIXs/vro0A+stf4sT0Gf22Got+xRWB8Cm0tw+qkRzBA==",
->>>>>>> package-lock
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.0.0",
         "@babel/helper-module-imports": "^7.0.0",
@@ -13678,52 +12528,6 @@
         "isobject": "^3.0.1",
         "mixin-deep": "^1.2.0",
         "pascalcase": "^0.1.1"
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        }
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
       }
     },
     "base-x": {
@@ -14170,50 +12974,12 @@
       }
     },
     "braces": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "dev": true,
-      "requires": {
-        "fill-range": "^7.0.1"
-=======
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dev": true,
-      "requires": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
->>>>>>> remove webpack from dependencies
-=======
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
       "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
       "dev": true,
       "requires": {
         "fill-range": "^7.0.1"
->>>>>>> package-lock
       }
     },
     "brcast": {
@@ -14658,10 +13424,6 @@
         "to-object-path": "^0.3.0",
         "union-value": "^1.0.0",
         "unset-value": "^1.0.0"
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
->>>>>>> package-lock
       },
       "dependencies": {
         "set-value": {
@@ -14676,11 +13438,6 @@
             "split-string": "^3.0.1"
           }
         }
-<<<<<<< dev-2
-=======
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
       }
     },
     "cacheable-lookup": {
@@ -14831,33 +13588,9 @@
       }
     },
     "caniuse-lite": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-<<<<<<< dev-2
-<<<<<<< dev-2
-      "version": "1.0.30001109",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001109.tgz",
-      "integrity": "sha512-4JIXRodHzdS3HdK8nSgIqXYLExOvG+D2/EenSvcub2Kp3QEADjo2v2oUn5g0n0D+UNwG9BtwKOyGcSq2qvQXvQ=="
-=======
-      "version": "1.0.30001107",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001107.tgz",
-      "integrity": "sha512-86rCH+G8onCmdN4VZzJet5uPELII59cUzDphko3thQFgAQG1RNa+sVLDoALIhRYmflo5iSIzWY3vu1XTWtNMQQ=="
->>>>>>> remove webpack from dependencies
-=======
-      "version": "1.0.30001109",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001109.tgz",
-      "integrity": "sha512-4JIXRodHzdS3HdK8nSgIqXYLExOvG+D2/EenSvcub2Kp3QEADjo2v2oUn5g0n0D+UNwG9BtwKOyGcSq2qvQXvQ=="
->>>>>>> package-lock
-=======
-      "version": "1.0.30001112",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001112.tgz",
-      "integrity": "sha512-J05RTQlqsatidif/38aN3PGULCLrg8OYQOlJUKbeYVzC2mGZkZLIztwRlB3MtrfLmawUmjFlNJvy/uhwniIe1Q=="
->>>>>>> package-lock
-=======
       "version": "1.0.30001113",
       "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001113.tgz",
       "integrity": "sha512-qMvjHiKH21zzM/VDZr6oosO6Ri3U0V2tC015jRXjOecwQCJtsU5zklTNTk31jQbIOP8gha0h1ccM/g0ECP+4BA=="
->>>>>>> 3box fix for identity-wallet
     },
     "capture-exit": {
       "version": "2.0.0",
@@ -15019,47 +13752,6 @@
         "is-glob": "~4.0.1",
         "normalize-path": "~3.0.0",
         "readdirp": "~3.4.0"
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
-      },
-      "dependencies": {
-        "braces": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-          "dev": true,
-          "requires": {
-            "fill-range": "^7.0.1"
-          }
-        },
-        "fill-range": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-          "dev": true,
-          "requires": {
-            "to-regex-range": "^5.0.1"
-          }
-        },
-        "is-number": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-          "dev": true
-        },
-        "to-regex-range": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-          "dev": true,
-          "requires": {
-            "is-number": "^7.0.0"
-          }
-        }
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
       }
     },
     "chownr": {
@@ -15374,10 +14066,6 @@
           "requires": {
             "is-descriptor": "^0.1.0"
           }
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
->>>>>>> package-lock
         },
         "is-accessor-descriptor": {
           "version": "0.1.6",
@@ -15441,11 +14129,6 @@
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
           "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
           "dev": true
-<<<<<<< dev-2
-=======
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
         }
       }
     },
@@ -15817,48 +14500,14 @@
       "integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM="
     },
     "compress-commons": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-4.0.1.tgz",
-      "integrity": "sha512-xZm9o6iikekkI0GnXCmAl3LQGZj5TBDj0zLowsqi7tJtEa3FMGSEcHcqrSJIrOAk1UG/NBbDn/F1q+MG/p/EsA==",
-      "dev": true,
-      "requires": {
-        "buffer-crc32": "^0.2.13",
-        "crc32-stream": "^4.0.0",
-        "normalize-path": "^3.0.0",
-        "readable-stream": "^3.6.0"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-          "dev": true,
-          "requires": {
-            "inherits": "^2.0.3",
-            "string_decoder": "^1.1.1",
-            "util-deprecate": "^1.0.1"
-          }
-        }
-=======
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-3.0.0.tgz",
-      "integrity": "sha512-FyDqr8TKX5/X0qo+aVfaZ+PVmNJHJeckFBlq8jZGSJOgnynhfifoyl24qaqdUdDIBe0EVTHByN6NAkqYvE/2Xg==",
-=======
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-4.0.1.tgz",
       "integrity": "sha512-xZm9o6iikekkI0GnXCmAl3LQGZj5TBDj0zLowsqi7tJtEa3FMGSEcHcqrSJIrOAk1UG/NBbDn/F1q+MG/p/EsA==",
->>>>>>> package-lock
       "dev": true,
       "requires": {
         "buffer-crc32": "^0.2.13",
         "crc32-stream": "^4.0.0",
         "normalize-path": "^3.0.0",
-<<<<<<< dev-2
-        "readable-stream": "^2.3.7"
->>>>>>> remove webpack from dependencies
-=======
         "readable-stream": "^3.6.0"
       },
       "dependencies": {
@@ -15873,7 +14522,6 @@
             "util-deprecate": "^1.0.1"
           }
         }
->>>>>>> package-lock
       }
     },
     "compressible": {
@@ -16093,10 +14741,6 @@
         "webpack-log": "^2.0.0"
       },
       "dependencies": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
->>>>>>> package-lock
         "find-cache-dir": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
@@ -16108,11 +14752,6 @@
             "pkg-dir": "^3.0.0"
           }
         },
-<<<<<<< dev-2
-=======
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
         "glob-parent": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
@@ -16146,10 +14785,6 @@
             "ignore": "^3.3.5",
             "pify": "^3.0.0",
             "slash": "^1.0.0"
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
->>>>>>> package-lock
           },
           "dependencies": {
             "pify": {
@@ -16168,7 +14803,6 @@
           "requires": {
             "pify": "^4.0.1",
             "semver": "^5.6.0"
-<<<<<<< dev-2
           }
         },
         "pify": {
@@ -16181,28 +14815,6 @@
           "version": "5.7.1",
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
           "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-=======
-          }
-        },
-        "pify": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
->>>>>>> remove webpack from dependencies
-=======
-          }
-        },
-        "pify": {
-          "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-          "dev": true
-        },
-        "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
->>>>>>> package-lock
           "dev": true
         },
         "serialize-javascript": {
@@ -16308,21 +14920,9 @@
       }
     },
     "crc32-stream": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-4.0.0.tgz",
-      "integrity": "sha512-tyMw2IeUX6t9jhgXI6um0eKfWq4EIDpfv5m7GX4Jzp7eVelQ360xd8EPXJhp2mHwLQIkqlnMLjzqSZI3a+0wRw==",
-=======
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-3.0.1.tgz",
-      "integrity": "sha512-mctvpXlbzsvK+6z8kJwSJ5crm7yBwrQMTybJzMw1O4lLGJqjlDCXY2Zw7KheiA6XBEcBmfLx1D88mjRGVJtY9w==",
->>>>>>> remove webpack from dependencies
-=======
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-4.0.0.tgz",
       "integrity": "sha512-tyMw2IeUX6t9jhgXI6um0eKfWq4EIDpfv5m7GX4Jzp7eVelQ360xd8EPXJhp2mHwLQIkqlnMLjzqSZI3a+0wRw==",
->>>>>>> package-lock
       "dev": true,
       "requires": {
         "crc": "^3.4.4",
@@ -17040,21 +15640,9 @@
       }
     },
     "csstype": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-      "version": "2.6.13",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.13.tgz",
-      "integrity": "sha512-ul26pfSQTZW8dcOnD2iiJssfXw0gdNVX9IJDH/X3K5DGPfj+fUYe3kB+swUY6BF3oZDxaID3AJt+9/ojSAE05A=="
-=======
-      "version": "2.6.11",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.11.tgz",
-      "integrity": "sha512-l8YyEC9NBkSm783PFTvh0FmJy7s5pFKrDp49ZL7zBGX3fWkO+N4EEyan1qqp8cwPLDcD0OSdyY6hAMoxp34JFw=="
->>>>>>> remove webpack from dependencies
-=======
       "version": "2.6.13",
       "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.13.tgz",
       "integrity": "sha512-ul26pfSQTZW8dcOnD2iiJssfXw0gdNVX9IJDH/X3K5DGPfj+fUYe3kB+swUY6BF3oZDxaID3AJt+9/ojSAE05A=="
->>>>>>> package-lock
     },
     "csv": {
       "version": "5.3.2",
@@ -17547,62 +16135,12 @@
       }
     },
     "define-property": {
-<<<<<<< dev-2
-<<<<<<< dev-2
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
       "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
       "dev": true,
       "requires": {
         "is-descriptor": "^1.0.0"
-=======
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
-      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
-      "dev": true,
-      "requires": {
-        "is-descriptor": "^1.0.2",
-        "isobject": "^3.0.1"
-      },
-      "dependencies": {
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        }
->>>>>>> remove webpack from dependencies
-=======
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-      "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-      "dev": true,
-      "requires": {
-        "is-descriptor": "^1.0.0"
->>>>>>> package-lock
       }
     },
     "defined": {
@@ -17739,21 +16277,12 @@
       "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz",
       "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw=="
     },
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
->>>>>>> package-lock
     "detect-node-es": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/detect-node-es/-/detect-node-es-1.0.0.tgz",
       "integrity": "sha512-S4AHriUkTX9FoFvL4G8hXDcx6t3gp2HpfCza3Q0v6S78gul2hKWifLQbeW+ZF89+hSm2ZIc/uF3J97ZgytgTRg==",
       "dev": true
     },
-<<<<<<< dev-2
-=======
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
     "detect-port": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/detect-port/-/detect-port-1.3.0.tgz",
@@ -17765,47 +16294,15 @@
       }
     },
     "devtools": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-<<<<<<< dev-2
-      "version": "6.3.6",
-      "resolved": "https://registry.npmjs.org/devtools/-/devtools-6.3.6.tgz",
-      "integrity": "sha512-Pkir5lsMvvONrcH9nUakGNOr/3y2FiOCuGg4O+0XX0CbSmLSZV+AmuXTZ+yBbRzpH3llUCkGMzsVVzFVhF5/aQ==",
-=======
-      "version": "6.3.4",
-      "resolved": "https://registry.npmjs.org/devtools/-/devtools-6.3.4.tgz",
-      "integrity": "sha512-dOcLdArp5/dJBzD8T5wcT2YgqkA22Mkqo0OS9cXz7JkHNgwOx1FI2Bq9GvP6o0TENHifYSYg3G0K/z0bacekqg==",
->>>>>>> remove webpack from dependencies
-=======
-      "version": "6.3.6",
-      "resolved": "https://registry.npmjs.org/devtools/-/devtools-6.3.6.tgz",
-      "integrity": "sha512-Pkir5lsMvvONrcH9nUakGNOr/3y2FiOCuGg4O+0XX0CbSmLSZV+AmuXTZ+yBbRzpH3llUCkGMzsVVzFVhF5/aQ==",
->>>>>>> package-lock
-=======
       "version": "6.4.0",
       "resolved": "https://registry.npmjs.org/devtools/-/devtools-6.4.0.tgz",
       "integrity": "sha512-E2T+tiElHOQg2t+5L4TZwTX9krTIsTIZy9AS/DMkEv0IFUqr314fIvBbsVzo9qk0dv88E7DSf+n5GsbSrMngpA==",
->>>>>>> package-lock
       "dev": true,
       "requires": {
         "@wdio/config": "6.1.14",
         "@wdio/logger": "6.0.16",
-<<<<<<< dev-2
-<<<<<<< dev-2
         "@wdio/protocols": "6.3.6",
-        "@wdio/utils": "6.3.6",
-=======
-        "@wdio/protocols": "6.3.0",
-        "@wdio/utils": "6.3.0",
->>>>>>> remove webpack from dependencies
-=======
-        "@wdio/protocols": "6.3.6",
-<<<<<<< dev-2
-        "@wdio/utils": "6.3.6",
->>>>>>> package-lock
-=======
         "@wdio/utils": "6.4.0",
->>>>>>> package-lock
         "chrome-launcher": "^0.13.1",
         "puppeteer-core": "^5.1.0",
         "ua-parser-js": "^0.7.21",
@@ -17813,21 +16310,9 @@
       },
       "dependencies": {
         "uuid": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-          "version": "8.3.0",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.0.tgz",
-          "integrity": "sha512-fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ==",
-=======
-          "version": "8.2.0",
-          "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.2.0.tgz",
-          "integrity": "sha512-CYpGiFTUrmI6OBMkAdjSDM0k5h8SkkiTP4WAjQgDgNB1S3Ou9VBEvr6q0Kv2H1mMk7IWfxYGpMH5sd5AvcIV2Q==",
->>>>>>> remove webpack from dependencies
-=======
           "version": "8.3.0",
           "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.0.tgz",
           "integrity": "sha512-fX6Z5o4m6XsXBdli9g7DtWgAx+osMsRRZFKma1mIUsLCz6vRvv+pz5VNbyu9UEDzpMWulZfvpgb/cmDXVulYFQ==",
->>>>>>> package-lock
           "dev": true
         }
       }
@@ -18349,33 +16834,9 @@
       "dev": true
     },
     "electron-to-chromium": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-<<<<<<< dev-2
-<<<<<<< dev-2
-      "version": "1.3.514",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.514.tgz",
-      "integrity": "sha512-8vb8zKIeGlZigeDzNWWthmGeLzo5CC43Lc+CZshMs7UXFVMPNLtXJGa/txedpu3OJFrXXVheBwp9PqOJJlHQ8w=="
-=======
-      "version": "1.3.509",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.509.tgz",
-      "integrity": "sha512-cN4lkjNRuTG8rtAqTOVgwpecEC2kbKA04PG6YijcKGHK/kD0xLjiqExcAOmLUwtXZRF8cBeam2I0VZcih919Ug=="
->>>>>>> remove webpack from dependencies
-=======
-      "version": "1.3.514",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.514.tgz",
-      "integrity": "sha512-8vb8zKIeGlZigeDzNWWthmGeLzo5CC43Lc+CZshMs7UXFVMPNLtXJGa/txedpu3OJFrXXVheBwp9PqOJJlHQ8w=="
->>>>>>> package-lock
-=======
-      "version": "1.3.526",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.526.tgz",
-      "integrity": "sha512-HiroW5ZbGwgT8kCnoEO8qnGjoTPzJxduvV/Vv/wH63eo2N6Zj3xT5fmmaSPAPUM05iN9/5fIEkIg3owTtV6QZg=="
->>>>>>> package-lock
-=======
       "version": "1.3.529",
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.529.tgz",
       "integrity": "sha512-n3sriLldqNyjBlosbnPftjCY+m1dVOY307I1Y0HaHAqDGe3hRvK7ksJwWd+qs599ybR4jobCo1+7zXM9GyNMSA=="
->>>>>>> 3box fix for identity-wallet
     },
     "element-resize-detector": {
       "version": "1.2.1",
@@ -19283,21 +17744,9 @@
       }
     },
     "eslint-plugin-react": {
-<<<<<<< dev-2
-<<<<<<< dev-2
       "version": "7.20.5",
       "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.20.5.tgz",
       "integrity": "sha512-ajbJfHuFnpVNJjhyrfq+pH1C0gLc2y94OiCbAXT5O0J0YCKaFEHDV8+3+mDOr+w8WguRX+vSs1bM2BDG0VLvCw==",
-=======
-      "version": "7.20.4",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.20.4.tgz",
-      "integrity": "sha512-y4DOQ0LrzuDQFEAnYFGjJMRHQQqfTco02qiWI00eGQYikHTzC15S5aRHGWSffnThv8sBpsmFBLky3K5keniAJg==",
->>>>>>> remove webpack from dependencies
-=======
-      "version": "7.20.5",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.20.5.tgz",
-      "integrity": "sha512-ajbJfHuFnpVNJjhyrfq+pH1C0gLc2y94OiCbAXT5O0J0YCKaFEHDV8+3+mDOr+w8WguRX+vSs1bM2BDG0VLvCw==",
->>>>>>> package-lock
       "dev": true,
       "requires": {
         "array-includes": "^3.1.1",
@@ -19438,21 +17887,9 @@
       }
     },
     "eth-json-rpc-errors": {
-<<<<<<< dev-2
-<<<<<<< dev-2
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/eth-json-rpc-errors/-/eth-json-rpc-errors-1.1.1.tgz",
       "integrity": "sha512-WT5shJ5KfNqHi9jOZD+ID8I1kuYWNrigtZat7GOQkvwo99f8SzAVaEcWhJUv656WiZOAg3P1RiJQANtUmDmbIg==",
-=======
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/eth-json-rpc-errors/-/eth-json-rpc-errors-2.0.2.tgz",
-      "integrity": "sha512-uBCRM2w2ewusRHGxN8JhcuOb2RN3ueAOYH/0BhqdFmQkZx5lj5+fLKTz0mIVOzd4FG5/kUksCzCD7eTEim6gaA==",
->>>>>>> remove webpack from dependencies
-=======
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/eth-json-rpc-errors/-/eth-json-rpc-errors-1.1.1.tgz",
-      "integrity": "sha512-WT5shJ5KfNqHi9jOZD+ID8I1kuYWNrigtZat7GOQkvwo99f8SzAVaEcWhJUv656WiZOAg3P1RiJQANtUmDmbIg==",
->>>>>>> package-lock
       "requires": {
         "fast-safe-stringify": "^2.0.6"
       }
@@ -19565,20 +18002,6 @@
         "safe-event-emitter": "^1.0.1"
       },
       "dependencies": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
-        "eth-json-rpc-errors": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/eth-json-rpc-errors/-/eth-json-rpc-errors-1.1.1.tgz",
-          "integrity": "sha512-WT5shJ5KfNqHi9jOZD+ID8I1kuYWNrigtZat7GOQkvwo99f8SzAVaEcWhJUv656WiZOAg3P1RiJQANtUmDmbIg==",
-          "requires": {
-            "fast-safe-stringify": "^2.0.6"
-          }
-        },
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
         "ethereum-common": {
           "version": "0.0.18",
           "resolved": "https://registry.npmjs.org/ethereum-common/-/ethereum-common-0.0.18.tgz",
@@ -19633,10 +18056,6 @@
         "xtend": "^4.0.1"
       }
     },
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
->>>>>>> package-lock
     "eth-rpc-errors": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/eth-rpc-errors/-/eth-rpc-errors-3.0.0.tgz",
@@ -19645,11 +18064,6 @@
         "fast-safe-stringify": "^2.0.6"
       }
     },
-<<<<<<< dev-2
-=======
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
     "eth-sig-util": {
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/eth-sig-util/-/eth-sig-util-1.4.2.tgz",
@@ -19897,21 +18311,9 @@
       }
     },
     "ethereumjs-common": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/ethereumjs-common/-/ethereumjs-common-1.5.2.tgz",
-      "integrity": "sha512-hTfZjwGX52GS2jcVO6E2sx4YuFnf0Fhp5ylo4pEPhEffNln7vS59Hr5sLnp3/QCazFLluuBZ+FZ6J5HTp0EqCA=="
-=======
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/ethereumjs-common/-/ethereumjs-common-1.5.1.tgz",
-      "integrity": "sha512-aVUPRLgmXORGXXEVkFYgPhr9TGtpBY2tGhZ9Uh0A3lIUzUDr1x6kQx33SbjPUkLkX3eniPQnIL/2psjkjrOfcQ=="
->>>>>>> remove webpack from dependencies
-=======
       "version": "1.5.2",
       "resolved": "https://registry.npmjs.org/ethereumjs-common/-/ethereumjs-common-1.5.2.tgz",
       "integrity": "sha512-hTfZjwGX52GS2jcVO6E2sx4YuFnf0Fhp5ylo4pEPhEffNln7vS59Hr5sLnp3/QCazFLluuBZ+FZ6J5HTp0EqCA=="
->>>>>>> package-lock
     },
     "ethereumjs-tx": {
       "version": "2.1.2",
@@ -20189,80 +18591,10 @@
             "is-descriptor": "^0.1.0"
           }
         },
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
->>>>>>> package-lock
         "is-accessor-descriptor": {
           "version": "0.1.6",
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
           "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-<<<<<<< dev-2
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-          "dev": true
-        },
-        "is-data-descriptor": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "is-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-          "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^0.1.6",
-            "is-data-descriptor": "^0.1.4",
-            "kind-of": "^5.0.0"
-          }
-        },
-        "kind-of": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-          "dev": true
-=======
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-=======
->>>>>>> package-lock
           "dev": true,
           "requires": {
             "kind-of": "^3.0.2"
@@ -20278,9 +18610,6 @@
               }
             }
           }
-<<<<<<< dev-2
->>>>>>> remove webpack from dependencies
-=======
         },
         "is-buffer": {
           "version": "1.1.6",
@@ -20324,7 +18653,6 @@
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
           "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
           "dev": true
->>>>>>> package-lock
         }
       }
     },
@@ -20426,21 +18754,6 @@
             "color-convert": "^2.0.1"
           }
         },
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
-        "braces": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-          "dev": true,
-          "requires": {
-            "fill-range": "^7.0.1"
-          }
-        },
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
         "chalk": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
@@ -20486,39 +18799,12 @@
             "jest-regex-util": "^26.0.0"
           }
         },
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
-        "fill-range": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-          "dev": true,
-          "requires": {
-            "to-regex-range": "^5.0.1"
-          }
-        },
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
         "has-flag": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
-        "is-number": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-          "dev": true
-        },
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
         "jest-diff": {
           "version": "26.3.0",
           "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.3.0.tgz",
@@ -20616,21 +18902,6 @@
           "requires": {
             "has-flag": "^4.0.0"
           }
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
-        },
-        "to-regex-range": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-          "dev": true,
-          "requires": {
-            "is-number": "^7.0.0"
-          }
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
         }
       }
     },
@@ -20704,42 +18975,12 @@
       "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
     },
     "extend-shallow": {
-<<<<<<< dev-2
-<<<<<<< dev-2
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
       "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
       "dev": true,
       "requires": {
         "is-extendable": "^0.1.0"
-=======
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-      "dev": true,
-      "requires": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
-      },
-      "dependencies": {
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "dev": true,
-          "requires": {
-            "is-plain-object": "^2.0.4"
-          }
-        }
->>>>>>> remove webpack from dependencies
-=======
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-      "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-      "dev": true,
-      "requires": {
-        "is-extendable": "^0.1.0"
->>>>>>> package-lock
       }
     },
     "external-editor": {
@@ -20778,61 +19019,6 @@
         "regex-not": "^1.0.0",
         "snapdragon": "^0.8.1",
         "to-regex": "^3.0.1"
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        }
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
       }
     },
     "extract-zip": {
@@ -21177,44 +19363,12 @@
       "integrity": "sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg=="
     },
     "fill-range": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "dev": true,
-      "requires": {
-        "to-regex-range": "^5.0.1"
-=======
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-      "dev": true,
-      "requires": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
->>>>>>> remove webpack from dependencies
-=======
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
       "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
       "dev": true,
       "requires": {
         "to-regex-range": "^5.0.1"
->>>>>>> package-lock
       }
     },
     "finalhandler": {
@@ -21232,8 +19386,6 @@
       }
     },
     "find-cache-dir": {
-<<<<<<< dev-2
-<<<<<<< dev-2
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz",
       "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==",
@@ -21295,77 +19447,6 @@
           "requires": {
             "find-up": "^4.0.0"
           }
-=======
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
-      "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
-=======
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz",
-      "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==",
->>>>>>> package-lock
-      "dev": true,
-      "requires": {
-        "commondir": "^1.0.1",
-        "make-dir": "^3.0.2",
-        "pkg-dir": "^4.1.0"
-      },
-      "dependencies": {
-        "find-up": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^5.0.0",
-            "path-exists": "^4.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^4.1.0"
-          }
-        },
-        "make-dir": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-          "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-          "dev": true,
-          "requires": {
-            "semver": "^6.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.2.0"
-          }
-        },
-        "path-exists": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-          "dev": true
-<<<<<<< dev-2
->>>>>>> remove webpack from dependencies
-=======
-        },
-        "pkg-dir": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-          "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-          "dev": true,
-          "requires": {
-            "find-up": "^4.0.0"
-          }
->>>>>>> package-lock
         }
       }
     },
@@ -21573,10 +19654,6 @@
           "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
           "dev": true
         },
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
->>>>>>> package-lock
         "braces": {
           "version": "2.3.2",
           "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
@@ -21595,11 +19672,6 @@
             "to-regex": "^3.0.1"
           }
         },
-<<<<<<< dev-2
-=======
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
         "chalk": {
           "version": "2.4.2",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
@@ -21631,10 +19703,6 @@
             "upath": "^1.1.1"
           }
         },
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
->>>>>>> package-lock
         "fill-range": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
@@ -21647,11 +19715,6 @@
             "to-regex-range": "^2.1.0"
           }
         },
-<<<<<<< dev-2
-=======
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
         "fsevents": {
           "version": "1.2.13",
           "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
@@ -21693,10 +19756,6 @@
             "binary-extensions": "^1.0.0"
           }
         },
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
->>>>>>> package-lock
         "is-buffer": {
           "version": "1.1.6",
           "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
@@ -21721,11 +19780,6 @@
             "is-buffer": "^1.1.5"
           }
         },
-<<<<<<< dev-2
-=======
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
         "readdirp": {
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
@@ -21751,10 +19805,6 @@
           "requires": {
             "has-flag": "^3.0.0"
           }
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
->>>>>>> package-lock
         },
         "to-regex-range": {
           "version": "2.1.1",
@@ -21765,11 +19815,6 @@
             "is-number": "^3.0.0",
             "repeat-string": "^1.6.1"
           }
-<<<<<<< dev-2
-=======
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
         }
       }
     },
@@ -21827,21 +19872,9 @@
       "integrity": "sha512-7WHpxTmKRbG2mkPzZrJU0bQi2SA3FKCjTLqDQHNoKiF2PI/ObBf3EYavPdga8TqXG/npK/voQe5vWarHjQHs2A=="
     },
     "fortmatic": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/fortmatic/-/fortmatic-2.2.1.tgz",
-      "integrity": "sha512-PEfPoErJSErU2A8iYD2Mab2c8eJK5dCdCr1jR/8yc49aEAlyQ4UXnZXyeO6MU5zBGkDAZmg9brnRSPzc+8MKPQ=="
-=======
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fortmatic/-/fortmatic-2.0.6.tgz",
-      "integrity": "sha512-/xT4QpZ3YxqTq6sSHMYw1rzApoHEQVJs8+gADDL39SVccEmBtCuHJIrztgasC8fAgrQkjTCWjDBlKtU/ChMyrA=="
->>>>>>> remove webpack from dependencies
-=======
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/fortmatic/-/fortmatic-2.2.1.tgz",
       "integrity": "sha512-PEfPoErJSErU2A8iYD2Mab2c8eJK5dCdCr1jR/8yc49aEAlyQ4UXnZXyeO6MU5zBGkDAZmg9brnRSPzc+8MKPQ=="
->>>>>>> package-lock
     },
     "forwarded": {
       "version": "0.1.2",
@@ -22004,22 +20037,14 @@
       "dependencies": {
         "ansi-regex": {
           "version": "4.1.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
           "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true
         },
         "ansi-styles": {
           "version": "3.2.1",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
           "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true,
           "requires": {
             "color-convert": "^1.9.0"
@@ -22027,12 +20052,8 @@
         },
         "bindings": {
           "version": "1.5.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
           "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true,
           "requires": {
             "file-uri-to-path": "1.0.0"
@@ -22040,12 +20061,8 @@
         },
         "bip66": {
           "version": "1.1.5",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/bip66/-/bip66-1.1.5.tgz",
           "integrity": "sha1-AfqHSHhcpwlV1QESF9GzE5lpyiI=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true,
           "requires": {
             "safe-buffer": "^5.0.1"
@@ -22053,32 +20070,20 @@
         },
         "bn.js": {
           "version": "4.11.8",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
           "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true
         },
         "brorand": {
           "version": "1.1.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
           "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true
         },
         "browserify-aes": {
           "version": "1.2.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
           "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true,
           "requires": {
             "buffer-xor": "^1.0.3",
@@ -22091,42 +20096,26 @@
         },
         "buffer-from": {
           "version": "1.1.1",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
           "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true
         },
         "buffer-xor": {
           "version": "1.0.3",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
           "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true
         },
         "camelcase": {
           "version": "5.3.1",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
           "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true
         },
         "cipher-base": {
           "version": "1.0.4",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
           "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true,
           "requires": {
             "inherits": "^2.0.1",
@@ -22135,12 +20124,8 @@
         },
         "cliui": {
           "version": "5.0.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
           "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true,
           "requires": {
             "string-width": "^3.1.0",
@@ -22150,12 +20135,8 @@
         },
         "color-convert": {
           "version": "1.9.3",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
           "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true,
           "requires": {
             "color-name": "1.1.3"
@@ -22163,22 +20144,14 @@
         },
         "color-name": {
           "version": "1.1.3",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
           "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true
         },
         "create-hash": {
           "version": "1.2.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
           "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true,
           "requires": {
             "cipher-base": "^1.0.1",
@@ -22190,12 +20163,8 @@
         },
         "create-hmac": {
           "version": "1.1.7",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
           "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true,
           "requires": {
             "cipher-base": "^1.0.3",
@@ -22208,12 +20177,8 @@
         },
         "cross-spawn": {
           "version": "6.0.5",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
           "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true,
           "requires": {
             "nice-try": "^1.0.4",
@@ -22225,22 +20190,14 @@
         },
         "decamelize": {
           "version": "1.2.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
           "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true
         },
         "drbg.js": {
           "version": "1.0.1",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/drbg.js/-/drbg.js-1.0.1.tgz",
           "integrity": "sha1-Pja2xCs3BDgjzbwzLVjzHiRFSAs=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true,
           "requires": {
             "browserify-aes": "^1.0.6",
@@ -22250,12 +20207,8 @@
         },
         "elliptic": {
           "version": "6.5.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.0.tgz",
           "integrity": "sha512-eFOJTMyCYb7xtE/caJ6JJu+bhi67WCYNbkGSknu20pmM8Ke/bqOfdnZWxyoGN26JgfxTbXrsCkEw4KheCT/KGg==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true,
           "requires": {
             "bn.js": "^4.4.0",
@@ -22269,22 +20222,14 @@
         },
         "emoji-regex": {
           "version": "7.0.3",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
           "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true
         },
         "end-of-stream": {
           "version": "1.4.1",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz",
           "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true,
           "requires": {
             "once": "^1.4.0"
@@ -22292,12 +20237,8 @@
         },
         "ethereumjs-util": {
           "version": "6.1.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.1.0.tgz",
           "integrity": "sha512-URESKMFbDeJxnAxPppnk2fN6Y3BIatn9fwn76Lm8bQlt+s52TpG8dN9M66MLPuRAiAOIqL3dfwqWJf0sd0fL0Q==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true,
           "requires": {
             "bn.js": "^4.11.0",
@@ -22311,12 +20252,8 @@
         },
         "ethjs-util": {
           "version": "0.1.6",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/ethjs-util/-/ethjs-util-0.1.6.tgz",
           "integrity": "sha512-CUnVOQq7gSpDHZVVrQW8ExxUETWrnrvXYvYz55wOU8Uj4VCgw56XC2B/fVqQN+f7gmrnRHSLVnFAwsCuNwji8w==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true,
           "requires": {
             "is-hex-prefixed": "1.0.0",
@@ -22325,12 +20262,8 @@
         },
         "evp_bytestokey": {
           "version": "1.0.3",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
           "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true,
           "requires": {
             "md5.js": "^1.3.4",
@@ -22339,12 +20272,8 @@
         },
         "execa": {
           "version": "1.0.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
           "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true,
           "requires": {
             "cross-spawn": "^6.0.0",
@@ -22358,22 +20287,14 @@
         },
         "file-uri-to-path": {
           "version": "1.0.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
           "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true
         },
         "find-up": {
           "version": "3.0.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
           "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true,
           "requires": {
             "locate-path": "^3.0.0"
@@ -22381,22 +20302,14 @@
         },
         "get-caller-file": {
           "version": "2.0.5",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
           "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true
         },
         "get-stream": {
           "version": "4.1.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
           "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true,
           "requires": {
             "pump": "^3.0.0"
@@ -22404,12 +20317,8 @@
         },
         "hash-base": {
           "version": "3.0.4",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
           "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true,
           "requires": {
             "inherits": "^2.0.1",
@@ -22418,12 +20327,8 @@
         },
         "hash.js": {
           "version": "1.1.7",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
           "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true,
           "requires": {
             "inherits": "^2.0.3",
@@ -22432,12 +20337,8 @@
         },
         "hmac-drbg": {
           "version": "1.0.1",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
           "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true,
           "requires": {
             "hash.js": "^1.0.3",
@@ -22447,72 +20348,44 @@
         },
         "inherits": {
           "version": "2.0.4",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
           "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true
         },
         "invert-kv": {
           "version": "2.0.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
           "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true
         },
         "is-fullwidth-code-point": {
           "version": "2.0.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
           "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true
         },
         "is-hex-prefixed": {
           "version": "1.0.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/is-hex-prefixed/-/is-hex-prefixed-1.0.0.tgz",
           "integrity": "sha1-fY035q135dEnFIkTxXPggtd39VQ=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true
         },
         "is-stream": {
           "version": "1.1.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
           "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true
         },
         "isexe": {
           "version": "2.0.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
           "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true
         },
         "keccak": {
           "version": "1.4.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/keccak/-/keccak-1.4.0.tgz",
           "integrity": "sha512-eZVaCpblK5formjPjeTBik7TAg+pqnDrMHIffSvi9Lh7PQgM1+hSzakUeZFCk9DVVG0dacZJuaz2ntwlzZUIBw==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true,
           "requires": {
             "bindings": "^1.2.1",
@@ -22523,12 +20396,8 @@
         },
         "lcid": {
           "version": "2.0.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
           "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true,
           "requires": {
             "invert-kv": "^2.0.0"
@@ -22536,12 +20405,8 @@
         },
         "locate-path": {
           "version": "3.0.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
           "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true,
           "requires": {
             "p-locate": "^3.0.0",
@@ -22550,12 +20415,8 @@
         },
         "map-age-cleaner": {
           "version": "0.1.3",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
           "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true,
           "requires": {
             "p-defer": "^1.0.0"
@@ -22563,12 +20424,8 @@
         },
         "md5.js": {
           "version": "1.3.5",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
           "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true,
           "requires": {
             "hash-base": "^3.0.0",
@@ -22578,12 +20435,8 @@
         },
         "mem": {
           "version": "4.3.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
           "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true,
           "requires": {
             "map-age-cleaner": "^0.1.1",
@@ -22593,62 +20446,38 @@
         },
         "mimic-fn": {
           "version": "2.1.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
           "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true
         },
         "minimalistic-assert": {
           "version": "1.0.1",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
           "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true
         },
         "minimalistic-crypto-utils": {
           "version": "1.0.1",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
           "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true
         },
         "nan": {
           "version": "2.14.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
           "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true
         },
         "nice-try": {
           "version": "1.0.5",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
           "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true
         },
         "npm-run-path": {
           "version": "2.0.2",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
           "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true,
           "requires": {
             "path-key": "^2.0.0"
@@ -22656,12 +20485,8 @@
         },
         "once": {
           "version": "1.4.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true,
           "requires": {
             "wrappy": "1"
@@ -22669,12 +20494,8 @@
         },
         "os-locale": {
           "version": "3.1.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
           "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true,
           "requires": {
             "execa": "^1.0.0",
@@ -22684,42 +20505,26 @@
         },
         "p-defer": {
           "version": "1.0.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
           "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true
         },
         "p-finally": {
           "version": "1.0.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
           "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true
         },
         "p-is-promise": {
           "version": "2.1.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
           "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true
         },
         "p-limit": {
           "version": "2.2.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz",
           "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true,
           "requires": {
             "p-try": "^2.0.0"
@@ -22727,12 +20532,8 @@
         },
         "p-locate": {
           "version": "3.0.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
           "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true,
           "requires": {
             "p-limit": "^2.0.0"
@@ -22740,42 +20541,26 @@
         },
         "p-try": {
           "version": "2.2.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
           "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true
         },
         "path-exists": {
           "version": "3.0.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
           "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true
         },
         "path-key": {
           "version": "2.0.1",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
           "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true
         },
         "pump": {
           "version": "3.0.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
           "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true,
           "requires": {
             "end-of-stream": "^1.1.0",
@@ -22784,32 +20569,20 @@
         },
         "require-directory": {
           "version": "2.1.1",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
           "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true
         },
         "require-main-filename": {
           "version": "2.0.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
           "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true
         },
         "ripemd160": {
           "version": "2.0.2",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
           "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true,
           "requires": {
             "hash-base": "^3.0.0",
@@ -22818,12 +20591,8 @@
         },
         "rlp": {
           "version": "2.2.3",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/rlp/-/rlp-2.2.3.tgz",
           "integrity": "sha512-l6YVrI7+d2vpW6D6rS05x2Xrmq8oW7v3pieZOJKBEdjuTF4Kz/iwk55Zyh1Zaz+KOB2kC8+2jZlp2u9L4tTzCQ==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true,
           "requires": {
             "bn.js": "^4.11.1",
@@ -22832,22 +20601,14 @@
         },
         "safe-buffer": {
           "version": "5.2.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
           "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true
         },
         "secp256k1": {
           "version": "3.7.1",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-3.7.1.tgz",
           "integrity": "sha512-1cf8sbnRreXrQFdH6qsg2H71Xw91fCCS9Yp021GnUNJzWJS/py96fS4lHbnTnouLp08Xj6jBoBB6V78Tdbdu5g==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true,
           "requires": {
             "bindings": "^1.5.0",
@@ -22862,32 +20623,20 @@
         },
         "semver": {
           "version": "5.7.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
           "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true
         },
         "set-blocking": {
           "version": "2.0.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
           "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true
         },
         "sha.js": {
           "version": "2.4.11",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
           "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true,
           "requires": {
             "inherits": "^2.0.1",
@@ -22896,12 +20645,8 @@
         },
         "shebang-command": {
           "version": "1.2.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
           "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true,
           "requires": {
             "shebang-regex": "^1.0.0"
@@ -22909,42 +20654,26 @@
         },
         "shebang-regex": {
           "version": "1.0.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
           "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true
         },
         "signal-exit": {
           "version": "3.0.2",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
           "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true
         },
         "source-map": {
           "version": "0.6.1",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true
         },
         "source-map-support": {
           "version": "0.5.12",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.12.tgz",
           "integrity": "sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true,
           "requires": {
             "buffer-from": "^1.0.0",
@@ -22953,12 +20682,8 @@
         },
         "string-width": {
           "version": "3.1.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
           "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true,
           "requires": {
             "emoji-regex": "^7.0.1",
@@ -22968,12 +20693,8 @@
         },
         "strip-ansi": {
           "version": "5.2.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
           "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true,
           "requires": {
             "ansi-regex": "^4.1.0"
@@ -22981,22 +20702,14 @@
         },
         "strip-eof": {
           "version": "1.0.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
           "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true
         },
         "strip-hex-prefix": {
           "version": "1.0.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/strip-hex-prefix/-/strip-hex-prefix-1.0.0.tgz",
           "integrity": "sha1-DF8VX+8RUTczd96du1iNoFUA428=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true,
           "requires": {
             "is-hex-prefixed": "1.0.0"
@@ -23004,12 +20717,8 @@
         },
         "which": {
           "version": "1.3.1",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
           "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true,
           "requires": {
             "isexe": "^2.0.0"
@@ -23017,22 +20726,14 @@
         },
         "which-module": {
           "version": "2.0.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
           "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true
         },
         "wrap-ansi": {
           "version": "5.1.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
           "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true,
           "requires": {
             "ansi-styles": "^3.2.0",
@@ -23042,32 +20743,20 @@
         },
         "wrappy": {
           "version": "1.0.2",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
           "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true
         },
         "y18n": {
           "version": "4.0.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
           "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true
         },
         "yargs": {
           "version": "13.2.4",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.2.4.tgz",
           "integrity": "sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true,
           "requires": {
             "cliui": "^5.0.0",
@@ -23085,12 +20774,8 @@
         },
         "yargs-parser": {
           "version": "13.1.1",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz",
           "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "dev": true,
           "requires": {
             "camelcase": "^5.0.0",
@@ -23163,42 +20848,26 @@
       "dependencies": {
         "abbrev": {
           "version": "1.1.1",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
           "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true
         },
         "ansi-regex": {
           "version": "2.1.1",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
           "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true
         },
         "aproba": {
           "version": "1.2.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
           "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true
         },
         "are-we-there-yet": {
           "version": "1.1.5",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
           "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true,
           "requires": {
             "delegates": "^1.0.0",
@@ -23207,22 +20876,14 @@
         },
         "balanced-match": {
           "version": "1.0.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
           "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
           "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
@@ -23231,62 +20892,38 @@
         },
         "chownr": {
           "version": "1.1.1",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz",
           "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true
         },
         "code-point-at": {
           "version": "1.1.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
           "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
           "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
           "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
           "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true
         },
         "debug": {
           "version": "4.1.1",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
           "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true,
           "requires": {
             "ms": "^2.1.1"
@@ -23294,42 +20931,26 @@
         },
         "deep-extend": {
           "version": "0.6.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
           "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true
         },
         "delegates": {
           "version": "1.0.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
           "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true
         },
         "detect-libc": {
           "version": "1.0.3",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
           "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true
         },
         "fs-minipass": {
           "version": "1.2.5",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz",
           "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true,
           "requires": {
             "minipass": "^2.2.1"
@@ -23337,22 +20958,14 @@
         },
         "fs.realpath": {
           "version": "1.0.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
           "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true
         },
         "gauge": {
           "version": "2.7.4",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
           "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true,
           "requires": {
             "aproba": "^1.0.3",
@@ -23367,12 +20980,8 @@
         },
         "glob": {
           "version": "7.1.3",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
           "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true,
           "requires": {
             "fs.realpath": "^1.0.0",
@@ -23385,22 +20994,14 @@
         },
         "has-unicode": {
           "version": "2.0.1",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
           "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true
         },
         "iconv-lite": {
           "version": "0.4.24",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
           "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true,
           "requires": {
             "safer-buffer": ">= 2.1.2 < 3"
@@ -23408,12 +21009,8 @@
         },
         "ignore-walk": {
           "version": "3.0.1",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz",
           "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true,
           "requires": {
             "minimatch": "^3.0.4"
@@ -23421,12 +21018,8 @@
         },
         "inflight": {
           "version": "1.0.6",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
           "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true,
           "requires": {
             "once": "^1.3.0",
@@ -23435,32 +21028,20 @@
         },
         "inherits": {
           "version": "2.0.3",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
           "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true
         },
         "ini": {
           "version": "1.3.5",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
           "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true
         },
         "is-fullwidth-code-point": {
           "version": "1.0.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
@@ -23468,22 +21049,14 @@
         },
         "isarray": {
           "version": "1.0.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true
         },
         "minimatch": {
           "version": "3.0.4",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
           "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
@@ -23491,22 +21064,14 @@
         },
         "minimist": {
           "version": "0.0.8",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
           "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true
         },
         "minipass": {
           "version": "2.3.5",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz",
           "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
@@ -23515,12 +21080,8 @@
         },
         "minizlib": {
           "version": "1.2.1",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz",
           "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true,
           "requires": {
             "minipass": "^2.2.1"
@@ -23528,12 +21089,8 @@
         },
         "mkdirp": {
           "version": "0.5.1",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
           "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true,
           "requires": {
             "minimist": "0.0.8"
@@ -23541,22 +21098,14 @@
         },
         "ms": {
           "version": "2.1.1",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
           "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true
         },
         "needle": {
           "version": "2.3.1",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/needle/-/needle-2.3.1.tgz",
           "integrity": "sha512-CaLXV3W8Vnbps8ZANqDGz7j4x7Yj1LW4TWF/TQuDfj7Cfx4nAPTvw98qgTevtto1oHDrh3pQkaODbqupXlsWTg==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true,
           "requires": {
             "debug": "^4.1.0",
@@ -23566,12 +21115,8 @@
         },
         "node-pre-gyp": {
           "version": "0.13.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.13.0.tgz",
           "integrity": "sha512-Md1D3xnEne8b/HGVQkZZwV27WUi1ZRuZBij24TNaZwUPU3ZAFtvT6xxJGaUVillfmMKnn5oD1HoGsp2Ftik7SQ==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true,
           "requires": {
             "detect-libc": "^1.0.2",
@@ -23588,12 +21133,8 @@
         },
         "nopt": {
           "version": "4.0.1",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
           "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true,
           "requires": {
             "abbrev": "1",
@@ -23602,22 +21143,14 @@
         },
         "npm-bundled": {
           "version": "1.0.6",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.6.tgz",
           "integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true
         },
         "npm-packlist": {
           "version": "1.4.1",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.1.tgz",
           "integrity": "sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true,
           "requires": {
             "ignore-walk": "^3.0.1",
@@ -23626,12 +21159,8 @@
         },
         "npmlog": {
           "version": "4.1.2",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
           "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true,
           "requires": {
             "are-we-there-yet": "~1.1.2",
@@ -23642,32 +21171,20 @@
         },
         "number-is-nan": {
           "version": "1.0.1",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
           "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true
         },
         "once": {
           "version": "1.4.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true,
           "requires": {
             "wrappy": "1"
@@ -23675,32 +21192,20 @@
         },
         "os-homedir": {
           "version": "1.0.2",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
           "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true
         },
         "os-tmpdir": {
           "version": "1.0.2",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
           "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true
         },
         "osenv": {
           "version": "0.1.5",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
           "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true,
           "requires": {
             "os-homedir": "^1.0.0",
@@ -23709,32 +21214,20 @@
         },
         "path-is-absolute": {
           "version": "1.0.1",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
           "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true
         },
         "process-nextick-args": {
           "version": "2.0.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
           "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true
         },
         "rc": {
           "version": "1.2.8",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
           "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true,
           "requires": {
             "deep-extend": "^0.6.0",
@@ -23745,24 +21238,16 @@
           "dependencies": {
             "minimist": {
               "version": "1.2.0",
-<<<<<<< dev-2
               "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
               "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-=======
-              "bundled": true,
->>>>>>> remove webpack from dependencies
               "optional": true
             }
           }
         },
         "readable-stream": {
           "version": "2.3.6",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true,
           "requires": {
             "core-util-is": "~1.0.0",
@@ -23776,12 +21261,8 @@
         },
         "rimraf": {
           "version": "2.6.3",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
           "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true,
           "requires": {
             "glob": "^7.1.3"
@@ -23789,72 +21270,44 @@
         },
         "safe-buffer": {
           "version": "5.1.2",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
           "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
           "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true
         },
         "sax": {
           "version": "1.2.4",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
           "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true
         },
         "semver": {
           "version": "5.7.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
           "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true
         },
         "set-blocking": {
           "version": "2.0.0",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
           "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true
         },
         "signal-exit": {
           "version": "3.0.2",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
           "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true
         },
         "string-width": {
           "version": "1.0.2",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
@@ -23864,12 +21317,8 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true,
           "requires": {
             "safe-buffer": "~5.1.0"
@@ -23877,12 +21326,8 @@
         },
         "strip-ansi": {
           "version": "3.0.1",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
@@ -23890,22 +21335,14 @@
         },
         "strip-json-comments": {
           "version": "2.0.1",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
           "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true
         },
         "tar": {
           "version": "4.4.8",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz",
           "integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true,
           "requires": {
             "chownr": "^1.1.1",
@@ -23919,22 +21356,14 @@
         },
         "util-deprecate": {
           "version": "1.0.2",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
           "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true
         },
         "wide-align": {
           "version": "1.1.3",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
           "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true,
           "requires": {
             "string-width": "^1.0.2 || 2"
@@ -23942,22 +21371,14 @@
         },
         "wrappy": {
           "version": "1.0.2",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
           "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true
         },
         "yallist": {
           "version": "3.0.3",
-<<<<<<< dev-2
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
           "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
-=======
-          "bundled": true,
->>>>>>> remove webpack from dependencies
           "optional": true
         }
       }
@@ -24579,21 +22000,9 @@
       }
     },
     "graphql-tag": {
-<<<<<<< dev-2
-<<<<<<< dev-2
       "version": "2.11.0",
       "resolved": "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.11.0.tgz",
       "integrity": "sha512-VmsD5pJqWJnQZMUeRwrDhfgoyqcfwEkvtpANqcoUG8/tOLkwNgU9mzub/Mc78OJMhHjx7gfAMTxzdG43VGg3bA=="
-=======
-      "version": "2.10.4",
-      "resolved": "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.10.4.tgz",
-      "integrity": "sha512-O7vG5BT3w6Sotc26ybcvLKNTdfr4GfsIVMD+LdYqXCeJIYPRyp8BIsDOUtxw7S1PYvRw5vH3278J2EDezR6mfA=="
->>>>>>> remove webpack from dependencies
-=======
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.11.0.tgz",
-      "integrity": "sha512-VmsD5pJqWJnQZMUeRwrDhfgoyqcfwEkvtpANqcoUG8/tOLkwNgU9mzub/Mc78OJMhHjx7gfAMTxzdG43VGg3bA=="
->>>>>>> package-lock
     },
     "growl": {
       "version": "1.10.5",
@@ -24688,27 +22097,11 @@
       "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
     },
     "har-validator": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-      "version": "5.1.5",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
-      "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
-      "requires": {
-        "ajv": "^6.12.3",
-=======
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
-      "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
-      "requires": {
-        "ajv": "^6.5.5",
->>>>>>> remove webpack from dependencies
-=======
       "version": "5.1.5",
       "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
       "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
       "requires": {
         "ajv": "^6.12.3",
->>>>>>> package-lock
         "har-schema": "^2.0.0"
       }
     },
@@ -24815,10 +22208,6 @@
           "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
           "dev": true
         },
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
->>>>>>> package-lock
         "is-number": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
@@ -24839,11 +22228,6 @@
             }
           }
         },
-<<<<<<< dev-2
-=======
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
         "kind-of": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
@@ -25197,10 +22581,6 @@
         }
       }
     },
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
->>>>>>> merge conflict errors
     "html-parse-stringify2": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/html-parse-stringify2/-/html-parse-stringify2-2.0.1.tgz",
@@ -25209,11 +22589,6 @@
         "void-elements": "^2.0.1"
       }
     },
-<<<<<<< dev-2
-=======
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> merge conflict errors
     "html-to-react": {
       "version": "1.4.3",
       "resolved": "https://registry.npmjs.org/html-to-react/-/html-to-react-1.4.3.tgz",
@@ -25460,10 +22835,6 @@
       "resolved": "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz",
       "integrity": "sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ=="
     },
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
->>>>>>> merge conflict errors
     "i18next": {
       "version": "19.6.3",
       "resolved": "https://registry.npmjs.org/i18next/-/i18next-19.6.3.tgz",
@@ -25472,11 +22843,6 @@
         "@babel/runtime": "^7.10.1"
       }
     },
-<<<<<<< dev-2
-=======
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> merge conflict errors
     "iconv-lite": {
       "version": "0.6.2",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.2.tgz",
@@ -25513,16 +22879,9 @@
       }
     },
     "identity-wallet": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/identity-wallet/-/identity-wallet-1.4.0.tgz",
-      "integrity": "sha512-3V9CPICqy/fzqSnFVp8MqESO+xTqmdCn2XoyO3KShxSS1jyyt47D6TWu1qz6tODKZvHunpgjeYfXzCGhlZWjpw==",
-=======
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/identity-wallet/-/identity-wallet-1.4.1.tgz",
       "integrity": "sha512-VRlpoin4gXqn6q1lx0rvTZn4lWCjRLQ6TcOigFPJgCF3mCWEqWcvwEsXIZR9vybX7N6Voiw3A1l1sqniVXfnnA==",
->>>>>>> 3box fix for identity-wallet
       "requires": {
         "3id-blockchain-utils": "^0.4.0",
         "@babel/runtime": "^7.4.5",
@@ -25601,63 +22960,6 @@
             "varint": "^5.0.0"
           }
         },
-=======
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/identity-wallet/-/identity-wallet-1.3.0.tgz",
-      "integrity": "sha512-jVyR81ZX+jbEwujMRui8nvggv06F7EzvUfG24iZy7xscb1iD6iJH2UeNhc2AvteGuphwzln7qm5GlrwhluMfrA==",
-      "requires": {
-        "3id-blockchain-utils": "^0.3.3",
-        "@babel/runtime": "^7.4.5",
-        "@ethersproject/hdnode": "5.0.0-beta.137",
-        "@ethersproject/wallet": "5.0.0-beta.136",
-        "did-jwt": "^0.1.3",
-        "events": "^3.0.0",
-        "ipfs-did-document": "^1.2.3",
-        "ipld-dag-cbor": "^0.15.0",
-        "js-sha256": "^0.9.0",
-        "multihashes": "^0.4.15",
-        "store": "^2.0.12",
-        "tweetnacl": "^1.0.1",
-        "tweetnacl-util": "^0.15.0"
-      },
-      "dependencies": {
-        "3id-blockchain-utils": {
-          "version": "0.3.4",
-          "resolved": "https://registry.npmjs.org/3id-blockchain-utils/-/3id-blockchain-utils-0.3.4.tgz",
-          "integrity": "sha512-GS3IfeXWnaLasHaOGvQukr9Gm+9IgofbysfkZF5X6lNztVysXhj5ZXv+Az5FmDNg3Q/ssVw7FfwK/r7HJYNi+g==",
-          "requires": {
-            "@ethersproject/contracts": "5.0.0-beta.152",
-            "@ethersproject/providers": "5.0.0-beta.144",
-            "@ethersproject/wallet": "5.0.0-beta.136"
-          }
-        },
-        "did-jwt": {
-          "version": "0.1.3",
-          "resolved": "https://registry.npmjs.org/did-jwt/-/did-jwt-0.1.3.tgz",
-          "integrity": "sha512-hZvjC4bstxo6bqFIOAlX90LdSaA5uxMdg0zSFCPm2WwIhgHFp4SfVM6f5yq1ebA5/cJzcUr+MclnTrlEiixuiQ==",
-          "requires": {
-            "@babel/runtime": "^7.3.1",
-            "base64url": "^3.0.1",
-            "buffer": "^5.2.1",
-            "did-resolver": "0.0.6",
-            "elliptic": "^6.4.0",
-            "js-sha256": "^0.9.0",
-            "js-sha3": "^0.8.0",
-            "tweetnacl": "^1.0.1",
-            "tweetnacl-util": "^0.15.0"
-          }
-        },
-        "did-resolver": {
-          "version": "0.0.6",
-          "resolved": "https://registry.npmjs.org/did-resolver/-/did-resolver-0.0.6.tgz",
-          "integrity": "sha512-PqxzaoomTbJG3IzEouUGgppu3xrsbGKHS75zS3vS/Hfm56XxLpwIe7yFLokgXUbMWmLa0dczFHOibmebO4wRLA=="
-        },
-        "js-sha3": {
-          "version": "0.8.0",
-          "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz",
-          "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q=="
-        },
->>>>>>> remove webpack from dependencies
         "tweetnacl": {
           "version": "1.0.3",
           "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz",
@@ -25992,20 +23294,6 @@
           "version": "2.0.3",
           "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
           "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="
-<<<<<<< dev-2
-=======
-        },
-        "nanoid": {
-<<<<<<< dev-2
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.10.tgz",
-          "integrity": "sha512-iZFMXKeXWkxzlfmMfM91gw7YhN2sdJtixY+eZh9V6QWJWTOiurhpKhBMgr82pfzgSqglQgqYSCowEYsz8D++6w=="
->>>>>>> remove webpack from dependencies
-=======
-          "version": "3.1.12",
-          "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.12.tgz",
-          "integrity": "sha512-1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A=="
->>>>>>> package-lock
         }
       }
     },
@@ -26309,15 +23597,9 @@
           "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="
         },
         "file-type": {
-<<<<<<< dev-2
           "version": "14.7.1",
           "resolved": "https://registry.npmjs.org/file-type/-/file-type-14.7.1.tgz",
           "integrity": "sha512-sXAMgFk67fQLcetXustxfKX+PZgHIUFn96Xld9uH8aXPdX3xOp0/jg9OdouVTvQrf7mrn+wAa4jN/y9fUOOiRA==",
-=======
-          "version": "14.6.2",
-          "resolved": "https://registry.npmjs.org/file-type/-/file-type-14.6.2.tgz",
-          "integrity": "sha512-kSZTAJxPXBdBgJyoC7TexkBWoMI/D1Gas6aTtAn9VIRFwCehwiluGV5O8O2GwqO5zIqeEvXxEKl/xfcaAKB0Yg==",
->>>>>>> remove webpack from dependencies
           "requires": {
             "readable-web-to-node-stream": "^2.0.0",
             "strtok3": "^6.0.3",
@@ -26334,64 +23616,26 @@
             "path-exists": "^4.0.0"
           }
         },
-<<<<<<< dev-2
-<<<<<<< dev-2
-        "fs-extra": {
-          "version": "8.1.0",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
-          "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
-          "requires": {
-            "graceful-fs": "^4.2.0",
-            "jsonfile": "^4.0.0",
-            "universalify": "^0.1.0"
-          }
-        },
-=======
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> revert to 3box 1.20.3
         "is-fullwidth-code-point": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
           "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
         },
-<<<<<<< dev-2
-<<<<<<< dev-2
-        "it-glob": {
-          "version": "0.0.7",
-          "resolved": "https://registry.npmjs.org/it-glob/-/it-glob-0.0.7.tgz",
-          "integrity": "sha512-XfbziJs4fi0MfdEGTLkZXeqo2EorF2baFXxFn1E2dGbgYMhFTZlZ2Yn/mx5CkpuLWVJvO1DwtTOVW2mzRyVK8w==",
-          "requires": {
-            "fs-extra": "^8.1.0",
-            "minimatch": "^3.0.4"
-          }
-        },
-=======
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> revert to 3box 1.20.3
         "js-sha3": {
           "version": "0.8.0",
           "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz",
           "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q=="
         },
         "libp2p-crypto": {
-<<<<<<< dev-2
           "version": "0.17.9",
           "resolved": "https://registry.npmjs.org/libp2p-crypto/-/libp2p-crypto-0.17.9.tgz",
           "integrity": "sha512-nH3vTfQ4UqhZ1SORTP7HOsmFdJBs604Qy0Xi3IFFtU6ofYt+rFAZ2QNgo4MH1ZTT38/LEM374N9K7yzj1IQm0g==",
-=======
-          "version": "0.17.8",
-          "resolved": "https://registry.npmjs.org/libp2p-crypto/-/libp2p-crypto-0.17.8.tgz",
-          "integrity": "sha512-jm5k4oqgV8NX9so65meWBkGC5bk6zvXyXWZKKUcnQcHHKnHUhuhIopSxIoBi5MDOrI1iLxn19+YOBFgSHkSaiA==",
->>>>>>> remove webpack from dependencies
           "requires": {
             "buffer": "^5.5.0",
             "err-code": "^2.0.0",
             "is-typedarray": "^1.0.0",
             "iso-random-stream": "^1.1.0",
             "keypair": "^1.0.1",
-<<<<<<< dev-2
             "multibase": "^1.0.1",
             "multicodec": "^1.0.4",
             "multihashing-async": "^0.8.1",
@@ -26412,15 +23656,6 @@
                 "buffer": "^5.5.0"
               }
             }
-=======
-            "multibase": "^0.7.0",
-            "multihashing-async": "^0.8.1",
-            "node-forge": "^0.9.1",
-            "pem-jwk": "^2.0.0",
-            "protons": "^1.0.1",
-            "secp256k1": "^4.0.0",
-            "ursa-optional": "~0.10.1"
->>>>>>> remove webpack from dependencies
           }
         },
         "locate-path": {
@@ -26844,20 +24079,6 @@
             "multihashes": "^1.0.1",
             "murmurhash3js-revisited": "^3.0.0"
           }
-<<<<<<< dev-2
-=======
-        },
-        "nanoid": {
-<<<<<<< dev-2
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.10.tgz",
-          "integrity": "sha512-iZFMXKeXWkxzlfmMfM91gw7YhN2sdJtixY+eZh9V6QWJWTOiurhpKhBMgr82pfzgSqglQgqYSCowEYsz8D++6w=="
->>>>>>> remove webpack from dependencies
-=======
-          "version": "3.1.12",
-          "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.12.tgz",
-          "integrity": "sha512-1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A=="
->>>>>>> package-lock
         }
       }
     },
@@ -27472,11 +24693,6 @@
             "universalify": "^1.0.0"
           }
         },
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
-=======
->>>>>>> revert to 3box 1.20.3
         "it-glob": {
           "version": "0.0.8",
           "resolved": "https://registry.npmjs.org/it-glob/-/it-glob-0.0.8.tgz",
@@ -27511,10 +24727,6 @@
             }
           }
         },
-<<<<<<< dev-2
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> revert to 3box 1.20.3
         "jsonfile": {
           "version": "6.0.1",
           "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz",
@@ -27524,14 +24736,6 @@
             "universalify": "^1.0.0"
           }
         },
-<<<<<<< dev-2
-=======
-        "nanoid": {
-          "version": "3.1.12",
-          "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.12.tgz",
-          "integrity": "sha512-1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A=="
-        },
->>>>>>> remove webpack from dependencies
         "universalify": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz",
@@ -28392,28 +25596,17 @@
       }
     },
     "ipns": {
-<<<<<<< dev-2
       "version": "0.7.4",
       "resolved": "https://registry.npmjs.org/ipns/-/ipns-0.7.4.tgz",
       "integrity": "sha512-M1yX3oU5NSTC1fRb7GFs3RZk9b7bKxtPfDLRO5ezOVaqviTWNsZerMi/AueD9HuwTMVRhFQODRXnsOWntU0oBg==",
-=======
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/ipns/-/ipns-0.7.3.tgz",
-      "integrity": "sha512-bvSrBGXecMmplB65fMlkMj/wqy2HjNRp6VRuXT7Tsr5TLREKKlfcfzqw75TIirLlYdmh77TqQ39LVhEwXGhQzQ==",
->>>>>>> remove webpack from dependencies
       "requires": {
         "buffer": "^5.6.0",
         "debug": "^4.1.1",
         "err-code": "^2.0.0",
         "interface-datastore": "^1.0.2",
         "libp2p-crypto": "^0.17.1",
-<<<<<<< dev-2
         "multibase": "^3.0.0",
         "multihashes": "^3.0.1",
-=======
-        "multibase": "^1.0.1",
-        "multihashes": "^1.0.1",
->>>>>>> remove webpack from dependencies
         "peer-id": "^0.13.6",
         "protons": "^1.0.1",
         "timestamp-nano": "^1.0.0"
@@ -28438,22 +25631,15 @@
           "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q=="
         },
         "libp2p-crypto": {
-<<<<<<< dev-2
           "version": "0.17.9",
           "resolved": "https://registry.npmjs.org/libp2p-crypto/-/libp2p-crypto-0.17.9.tgz",
           "integrity": "sha512-nH3vTfQ4UqhZ1SORTP7HOsmFdJBs604Qy0Xi3IFFtU6ofYt+rFAZ2QNgo4MH1ZTT38/LEM374N9K7yzj1IQm0g==",
-=======
-          "version": "0.17.8",
-          "resolved": "https://registry.npmjs.org/libp2p-crypto/-/libp2p-crypto-0.17.8.tgz",
-          "integrity": "sha512-jm5k4oqgV8NX9so65meWBkGC5bk6zvXyXWZKKUcnQcHHKnHUhuhIopSxIoBi5MDOrI1iLxn19+YOBFgSHkSaiA==",
->>>>>>> remove webpack from dependencies
           "requires": {
             "buffer": "^5.5.0",
             "err-code": "^2.0.0",
             "is-typedarray": "^1.0.0",
             "iso-random-stream": "^1.1.0",
             "keypair": "^1.0.1",
-<<<<<<< dev-2
             "multibase": "^1.0.1",
             "multicodec": "^1.0.4",
             "multihashing-async": "^0.8.1",
@@ -28469,21 +25655,6 @@
               "version": "1.0.1",
               "resolved": "https://registry.npmjs.org/multibase/-/multibase-1.0.1.tgz",
               "integrity": "sha512-KcCxpBVY8fdVKu4dJMAahq4F/2Z/9xqEjIiR7PiMe7LRGeorFn2NLmicN6nLBCqQvft6MG2Lc9X5P0IdyvnxEw==",
-=======
-            "multibase": "^0.7.0",
-            "multihashing-async": "^0.8.1",
-            "node-forge": "^0.9.1",
-            "pem-jwk": "^2.0.0",
-            "protons": "^1.0.1",
-            "secp256k1": "^4.0.0",
-            "ursa-optional": "~0.10.1"
-          },
-          "dependencies": {
-            "multibase": {
-              "version": "0.7.0",
-              "resolved": "https://registry.npmjs.org/multibase/-/multibase-0.7.0.tgz",
-              "integrity": "sha512-TW8q03O0f6PNFTQDvh3xxH03c8CjGaaYrjkl9UQPG6rz53TQzzxJVCIWVjzcbN/Q5Y53Zd0IBQBMVktVgNx4Fg==",
->>>>>>> remove webpack from dependencies
               "requires": {
                 "base-x": "^3.0.8",
                 "buffer": "^5.5.0"
@@ -28497,7 +25668,6 @@
           "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
         },
         "multibase": {
-<<<<<<< dev-2
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/multibase/-/multibase-3.0.0.tgz",
           "integrity": "sha512-fuB+zfRbF5zWV4L+CPM0dgA0gX7DHG/IMyzwhVi2RxbRVWn41Wk7SkKW8cxYDGOg6TVh7XgyoesjOAYrB1HBAA==",
@@ -28522,23 +25692,6 @@
           "requires": {
             "multibase": "^3.0.0",
             "uint8arrays": "^1.0.0",
-=======
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/multibase/-/multibase-1.0.1.tgz",
-          "integrity": "sha512-KcCxpBVY8fdVKu4dJMAahq4F/2Z/9xqEjIiR7PiMe7LRGeorFn2NLmicN6nLBCqQvft6MG2Lc9X5P0IdyvnxEw==",
-          "requires": {
-            "base-x": "^3.0.8",
-            "buffer": "^5.5.0"
-          }
-        },
-        "multihashes": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/multihashes/-/multihashes-1.0.1.tgz",
-          "integrity": "sha512-S27Tepg4i8atNiFaU5ZOm3+gl3KQlUanLs/jWcBxQHFttgq+5x1OgbQmf2d8axJ/48zYGBd/wT9d723USMFduw==",
-          "requires": {
-            "buffer": "^5.6.0",
-            "multibase": "^1.0.1",
->>>>>>> remove webpack from dependencies
             "varint": "^5.0.0"
           }
         },
@@ -28553,7 +25706,6 @@
             "js-sha3": "^0.8.0",
             "multihashes": "^1.0.1",
             "murmurhash3js-revisited": "^3.0.0"
-<<<<<<< dev-2
           },
           "dependencies": {
             "multibase": {
@@ -28575,8 +25727,6 @@
                 "varint": "^5.0.0"
               }
             }
-=======
->>>>>>> remove webpack from dependencies
           }
         }
       }
@@ -28588,47 +25738,12 @@
       "dev": true
     },
     "is-accessor-descriptor": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-      "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-      "dev": true,
-      "requires": {
-        "kind-of": "^6.0.0"
-=======
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-      "dev": true,
-      "requires": {
-        "kind-of": "^3.0.2"
-      },
-      "dependencies": {
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
->>>>>>> remove webpack from dependencies
-=======
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
       "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
       "dev": true,
       "requires": {
         "kind-of": "^6.0.0"
->>>>>>> package-lock
       }
     },
     "is-alphabetical": {
@@ -28702,47 +25817,12 @@
       }
     },
     "is-data-descriptor": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-      "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-      "dev": true,
-      "requires": {
-        "kind-of": "^6.0.0"
-=======
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-      "dev": true,
-      "requires": {
-        "kind-of": "^3.0.2"
-      },
-      "dependencies": {
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
->>>>>>> remove webpack from dependencies
-=======
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
       "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
       "dev": true,
       "requires": {
         "kind-of": "^6.0.0"
->>>>>>> package-lock
       }
     },
     "is-date-object": {
@@ -28756,35 +25836,6 @@
       "integrity": "sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw=="
     },
     "is-descriptor": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-      "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-      "dev": true,
-      "requires": {
-        "is-accessor-descriptor": "^1.0.0",
-        "is-data-descriptor": "^1.0.0",
-        "kind-of": "^6.0.2"
-=======
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-      "dev": true,
-      "requires": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-          "dev": true
-        }
->>>>>>> remove webpack from dependencies
-=======
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
       "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
@@ -28793,7 +25844,6 @@
         "is-accessor-descriptor": "^1.0.0",
         "is-data-descriptor": "^1.0.0",
         "kind-of": "^6.0.2"
->>>>>>> package-lock
       }
     },
     "is-directory": {
@@ -28983,43 +26033,10 @@
       "integrity": "sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig=="
     },
     "is-number": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
->>>>>>> package-lock
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-6.0.0.tgz",
       "integrity": "sha512-Wu1VHeILBK8KAWJUAiSZQX94GmOE45Rg6/538fKwiloUu21KncEkYGPqob2oSZ5mUT73vLGrHQjKw3KMPwfDzg==",
       "dev": true
-<<<<<<< dev-2
-=======
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-      "dev": true,
-      "requires": {
-        "kind-of": "^3.0.2"
-      },
-      "dependencies": {
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-          "dev": true
-        },
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
     },
     "is-obj": {
       "version": "2.0.0",
@@ -29507,21 +26524,9 @@
       "integrity": "sha512-hU5ObR14987PR7l0J7dfWAgKYiWoKbXcoXKqhQDGgHSZML6UPmHSS9ILBGucZkoA2B152kEqEOllS4tVQq11fg=="
     },
     "it-glob": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/it-glob/-/it-glob-0.0.8.tgz",
-      "integrity": "sha512-PmIAgb64aJPM6wwT1UTlNDAJnNgdGrvr0vRr3AYCngcUuq1KaAovuz0dQAmUkaXudDG3EQzc7OttuLW9DaL3YQ==",
-=======
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/it-glob/-/it-glob-0.0.7.tgz",
-      "integrity": "sha512-XfbziJs4fi0MfdEGTLkZXeqo2EorF2baFXxFn1E2dGbgYMhFTZlZ2Yn/mx5CkpuLWVJvO1DwtTOVW2mzRyVK8w==",
->>>>>>> remove webpack from dependencies
-=======
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/it-glob/-/it-glob-0.0.7.tgz",
       "integrity": "sha512-XfbziJs4fi0MfdEGTLkZXeqo2EorF2baFXxFn1E2dGbgYMhFTZlZ2Yn/mx5CkpuLWVJvO1DwtTOVW2mzRyVK8w==",
->>>>>>> revert to 3box 1.20.3
       "requires": {
         "fs-extra": "^8.1.0",
         "minimatch": "^3.0.4"
@@ -30988,37 +27993,11 @@
       "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="
     },
     "json-rpc-engine": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-<<<<<<< dev-2
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/json-rpc-engine/-/json-rpc-engine-5.2.0.tgz",
-      "integrity": "sha512-F9xjrIjMqPNCxzk9jtOgJMs9mt+80p03IbJALnO278grtSU+Sh/fSqb7gNk/gwlTxavO2+ABKenyz4ZP3kwKIQ==",
-      "requires": {
-        "eth-rpc-errors": "^2.1.1",
-=======
-      "version": "5.1.8",
-      "resolved": "https://registry.npmjs.org/json-rpc-engine/-/json-rpc-engine-5.1.8.tgz",
-      "integrity": "sha512-vTBSDEPJV1fPAsbm2g5sEuPjsgLdiab2f1CTn2PyRr8nxggUpA996PDlNQDsM0gnrA99F8KIBLq2nIKrOFl1Mg==",
-      "requires": {
-        "async": "^2.0.1",
-        "eth-json-rpc-errors": "^2.0.1",
-        "promise-to-callback": "^1.0.0",
->>>>>>> remove webpack from dependencies
-=======
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/json-rpc-engine/-/json-rpc-engine-5.2.0.tgz",
-      "integrity": "sha512-F9xjrIjMqPNCxzk9jtOgJMs9mt+80p03IbJALnO278grtSU+Sh/fSqb7gNk/gwlTxavO2+ABKenyz4ZP3kwKIQ==",
-      "requires": {
-        "eth-rpc-errors": "^2.1.1",
->>>>>>> package-lock
-=======
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/json-rpc-engine/-/json-rpc-engine-5.3.0.tgz",
       "integrity": "sha512-+diJ9s8rxB+fbJhT7ZEf8r8spaLRignLd8jTgQ/h5JSGppAHGtNMZtCoabipCaleR1B3GTGxbXBOqhaJSGmPGQ==",
       "requires": {
         "eth-rpc-errors": "^3.0.0",
->>>>>>> package-lock
         "safe-event-emitter": "^1.0.1"
       }
     },
@@ -32001,22 +28980,15 @@
           "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q=="
         },
         "libp2p-crypto": {
-<<<<<<< dev-2
           "version": "0.17.9",
           "resolved": "https://registry.npmjs.org/libp2p-crypto/-/libp2p-crypto-0.17.9.tgz",
           "integrity": "sha512-nH3vTfQ4UqhZ1SORTP7HOsmFdJBs604Qy0Xi3IFFtU6ofYt+rFAZ2QNgo4MH1ZTT38/LEM374N9K7yzj1IQm0g==",
-=======
-          "version": "0.17.8",
-          "resolved": "https://registry.npmjs.org/libp2p-crypto/-/libp2p-crypto-0.17.8.tgz",
-          "integrity": "sha512-jm5k4oqgV8NX9so65meWBkGC5bk6zvXyXWZKKUcnQcHHKnHUhuhIopSxIoBi5MDOrI1iLxn19+YOBFgSHkSaiA==",
->>>>>>> remove webpack from dependencies
           "requires": {
             "buffer": "^5.5.0",
             "err-code": "^2.0.0",
             "is-typedarray": "^1.0.0",
             "iso-random-stream": "^1.1.0",
             "keypair": "^1.0.1",
-<<<<<<< dev-2
             "multibase": "^1.0.1",
             "multicodec": "^1.0.4",
             "multihashing-async": "^0.8.1",
@@ -32026,15 +28998,6 @@
             "secp256k1": "^4.0.0",
             "uint8arrays": "^1.0.0",
             "ursa-optional": "^0.10.1"
-=======
-            "multibase": "^0.7.0",
-            "multihashing-async": "^0.8.1",
-            "node-forge": "^0.9.1",
-            "pem-jwk": "^2.0.0",
-            "protons": "^1.0.1",
-            "secp256k1": "^4.0.0",
-            "ursa-optional": "~0.10.1"
->>>>>>> remove webpack from dependencies
           }
         },
         "ms": {
@@ -32042,7 +29005,6 @@
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
           "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
         },
-<<<<<<< dev-2
         "multibase": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/multibase/-/multibase-1.0.1.tgz",
@@ -32061,8 +29023,6 @@
             "varint": "^5.0.0"
           }
         },
-=======
->>>>>>> remove webpack from dependencies
         "multihashes": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/multihashes/-/multihashes-1.0.1.tgz",
@@ -32071,20 +29031,6 @@
             "buffer": "^5.6.0",
             "multibase": "^1.0.1",
             "varint": "^5.0.0"
-<<<<<<< dev-2
-=======
-          },
-          "dependencies": {
-            "multibase": {
-              "version": "1.0.1",
-              "resolved": "https://registry.npmjs.org/multibase/-/multibase-1.0.1.tgz",
-              "integrity": "sha512-KcCxpBVY8fdVKu4dJMAahq4F/2Z/9xqEjIiR7PiMe7LRGeorFn2NLmicN6nLBCqQvft6MG2Lc9X5P0IdyvnxEw==",
-              "requires": {
-                "base-x": "^3.0.8",
-                "buffer": "^5.5.0"
-              }
-            }
->>>>>>> remove webpack from dependencies
           }
         },
         "multihashing-async": {
@@ -32532,46 +29478,6 @@
             }
           }
         },
-<<<<<<< dev-2
-<<<<<<< dev-2
-        "it-glob": {
-          "version": "0.0.7",
-          "resolved": "https://registry.npmjs.org/it-glob/-/it-glob-0.0.7.tgz",
-          "integrity": "sha512-XfbziJs4fi0MfdEGTLkZXeqo2EorF2baFXxFn1E2dGbgYMhFTZlZ2Yn/mx5CkpuLWVJvO1DwtTOVW2mzRyVK8w==",
-          "requires": {
-            "fs-extra": "^8.1.0",
-            "minimatch": "^3.0.4"
-          },
-          "dependencies": {
-            "fs-extra": {
-              "version": "8.1.0",
-              "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
-              "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
-              "requires": {
-                "graceful-fs": "^4.2.0",
-                "jsonfile": "^4.0.0",
-                "universalify": "^0.1.0"
-              }
-            },
-            "jsonfile": {
-              "version": "4.0.0",
-              "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-              "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-              "requires": {
-                "graceful-fs": "^4.1.6"
-              }
-            },
-            "universalify": {
-              "version": "0.1.2",
-              "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-              "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
-            }
-          }
-        },
-=======
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> revert to 3box 1.20.3
         "js-sha3": {
           "version": "0.8.0",
           "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz",
@@ -32587,22 +29493,15 @@
           }
         },
         "libp2p-crypto": {
-<<<<<<< dev-2
           "version": "0.17.9",
           "resolved": "https://registry.npmjs.org/libp2p-crypto/-/libp2p-crypto-0.17.9.tgz",
           "integrity": "sha512-nH3vTfQ4UqhZ1SORTP7HOsmFdJBs604Qy0Xi3IFFtU6ofYt+rFAZ2QNgo4MH1ZTT38/LEM374N9K7yzj1IQm0g==",
-=======
-          "version": "0.17.8",
-          "resolved": "https://registry.npmjs.org/libp2p-crypto/-/libp2p-crypto-0.17.8.tgz",
-          "integrity": "sha512-jm5k4oqgV8NX9so65meWBkGC5bk6zvXyXWZKKUcnQcHHKnHUhuhIopSxIoBi5MDOrI1iLxn19+YOBFgSHkSaiA==",
->>>>>>> remove webpack from dependencies
           "requires": {
             "buffer": "^5.5.0",
             "err-code": "^2.0.0",
             "is-typedarray": "^1.0.0",
             "iso-random-stream": "^1.1.0",
             "keypair": "^1.0.1",
-<<<<<<< dev-2
             "multibase": "^1.0.1",
             "multicodec": "^1.0.4",
             "multihashing-async": "^0.8.1",
@@ -32612,26 +29511,6 @@
             "secp256k1": "^4.0.0",
             "uint8arrays": "^1.0.0",
             "ursa-optional": "^0.10.1"
-=======
-            "multibase": "^0.7.0",
-            "multihashing-async": "^0.8.1",
-            "node-forge": "^0.9.1",
-            "pem-jwk": "^2.0.0",
-            "protons": "^1.0.1",
-            "secp256k1": "^4.0.0",
-            "ursa-optional": "~0.10.1"
-          },
-          "dependencies": {
-            "multibase": {
-              "version": "0.7.0",
-              "resolved": "https://registry.npmjs.org/multibase/-/multibase-0.7.0.tgz",
-              "integrity": "sha512-TW8q03O0f6PNFTQDvh3xxH03c8CjGaaYrjkl9UQPG6rz53TQzzxJVCIWVjzcbN/Q5Y53Zd0IBQBMVktVgNx4Fg==",
-              "requires": {
-                "base-x": "^3.0.8",
-                "buffer": "^5.5.0"
-              }
-            }
->>>>>>> remove webpack from dependencies
           }
         },
         "ms": {
@@ -32682,14 +29561,6 @@
             }
           }
         },
-<<<<<<< dev-2
-=======
-        "nanoid": {
-          "version": "3.1.12",
-          "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.12.tgz",
-          "integrity": "sha512-1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A=="
-        },
->>>>>>> remove webpack from dependencies
         "p-map": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
@@ -32737,22 +29608,15 @@
           "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q=="
         },
         "libp2p-crypto": {
-<<<<<<< dev-2
           "version": "0.17.9",
           "resolved": "https://registry.npmjs.org/libp2p-crypto/-/libp2p-crypto-0.17.9.tgz",
           "integrity": "sha512-nH3vTfQ4UqhZ1SORTP7HOsmFdJBs604Qy0Xi3IFFtU6ofYt+rFAZ2QNgo4MH1ZTT38/LEM374N9K7yzj1IQm0g==",
-=======
-          "version": "0.17.8",
-          "resolved": "https://registry.npmjs.org/libp2p-crypto/-/libp2p-crypto-0.17.8.tgz",
-          "integrity": "sha512-jm5k4oqgV8NX9so65meWBkGC5bk6zvXyXWZKKUcnQcHHKnHUhuhIopSxIoBi5MDOrI1iLxn19+YOBFgSHkSaiA==",
->>>>>>> remove webpack from dependencies
           "requires": {
             "buffer": "^5.5.0",
             "err-code": "^2.0.0",
             "is-typedarray": "^1.0.0",
             "iso-random-stream": "^1.1.0",
             "keypair": "^1.0.1",
-<<<<<<< dev-2
             "multibase": "^1.0.1",
             "multicodec": "^1.0.4",
             "multihashing-async": "^0.8.1",
@@ -32780,15 +29644,6 @@
           "requires": {
             "buffer": "^5.6.0",
             "varint": "^5.0.0"
-=======
-            "multibase": "^0.7.0",
-            "multihashing-async": "^0.8.1",
-            "node-forge": "^0.9.1",
-            "pem-jwk": "^2.0.0",
-            "protons": "^1.0.1",
-            "secp256k1": "^4.0.0",
-            "ursa-optional": "~0.10.1"
->>>>>>> remove webpack from dependencies
           }
         },
         "multihashes": {
@@ -32799,20 +29654,6 @@
             "buffer": "^5.6.0",
             "multibase": "^1.0.1",
             "varint": "^5.0.0"
-<<<<<<< dev-2
-=======
-          },
-          "dependencies": {
-            "multibase": {
-              "version": "1.0.1",
-              "resolved": "https://registry.npmjs.org/multibase/-/multibase-1.0.1.tgz",
-              "integrity": "sha512-KcCxpBVY8fdVKu4dJMAahq4F/2Z/9xqEjIiR7PiMe7LRGeorFn2NLmicN6nLBCqQvft6MG2Lc9X5P0IdyvnxEw==",
-              "requires": {
-                "base-x": "^3.0.8",
-                "buffer": "^5.5.0"
-              }
-            }
->>>>>>> remove webpack from dependencies
           }
         },
         "multihashing-async": {
@@ -33047,22 +29888,15 @@
           "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q=="
         },
         "libp2p-crypto": {
-<<<<<<< dev-2
           "version": "0.17.9",
           "resolved": "https://registry.npmjs.org/libp2p-crypto/-/libp2p-crypto-0.17.9.tgz",
           "integrity": "sha512-nH3vTfQ4UqhZ1SORTP7HOsmFdJBs604Qy0Xi3IFFtU6ofYt+rFAZ2QNgo4MH1ZTT38/LEM374N9K7yzj1IQm0g==",
-=======
-          "version": "0.17.8",
-          "resolved": "https://registry.npmjs.org/libp2p-crypto/-/libp2p-crypto-0.17.8.tgz",
-          "integrity": "sha512-jm5k4oqgV8NX9so65meWBkGC5bk6zvXyXWZKKUcnQcHHKnHUhuhIopSxIoBi5MDOrI1iLxn19+YOBFgSHkSaiA==",
->>>>>>> remove webpack from dependencies
           "requires": {
             "buffer": "^5.5.0",
             "err-code": "^2.0.0",
             "is-typedarray": "^1.0.0",
             "iso-random-stream": "^1.1.0",
             "keypair": "^1.0.1",
-<<<<<<< dev-2
             "multibase": "^1.0.1",
             "multicodec": "^1.0.4",
             "multihashing-async": "^0.8.1",
@@ -33083,15 +29917,6 @@
                 "buffer": "^5.5.0"
               }
             }
-=======
-            "multibase": "^0.7.0",
-            "multihashing-async": "^0.8.1",
-            "node-forge": "^0.9.1",
-            "pem-jwk": "^2.0.0",
-            "protons": "^1.0.1",
-            "secp256k1": "^4.0.0",
-            "ursa-optional": "~0.10.1"
->>>>>>> remove webpack from dependencies
           }
         },
         "ms": {
@@ -33099,211 +29924,6 @@
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
           "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
         },
-<<<<<<< dev-2
-        "multicodec": {
-          "version": "1.0.4",
-          "resolved": "https://registry.npmjs.org/multicodec/-/multicodec-1.0.4.tgz",
-          "integrity": "sha512-NDd7FeS3QamVtbgfvu5h7fd1IlbaC4EQ0/pgU4zqE2vdHCmBGsUa0TiM8/TdSeG6BMPC92OOCf8F1ocE/Wkrrg==",
-          "requires": {
-            "buffer": "^5.6.0",
-            "varint": "^5.0.0"
-          }
-        },
-=======
->>>>>>> remove webpack from dependencies
-        "multihashes": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/multihashes/-/multihashes-1.0.1.tgz",
-          "integrity": "sha512-S27Tepg4i8atNiFaU5ZOm3+gl3KQlUanLs/jWcBxQHFttgq+5x1OgbQmf2d8axJ/48zYGBd/wT9d723USMFduw==",
-          "requires": {
-            "buffer": "^5.6.0",
-            "multibase": "^1.0.1",
-            "varint": "^5.0.0"
-          },
-          "dependencies": {
-            "multibase": {
-              "version": "1.0.1",
-              "resolved": "https://registry.npmjs.org/multibase/-/multibase-1.0.1.tgz",
-              "integrity": "sha512-KcCxpBVY8fdVKu4dJMAahq4F/2Z/9xqEjIiR7PiMe7LRGeorFn2NLmicN6nLBCqQvft6MG2Lc9X5P0IdyvnxEw==",
-              "requires": {
-                "base-x": "^3.0.8",
-                "buffer": "^5.5.0"
-              }
-            }
-          }
-        },
-        "multihashing-async": {
-          "version": "0.8.2",
-          "resolved": "https://registry.npmjs.org/multihashing-async/-/multihashing-async-0.8.2.tgz",
-          "integrity": "sha512-2lKa1autuCy8x7KIEj9aVNbAb3aIMRFYIwN7mq/zD4pxgNIVgGlm+f6GKY4880EOF2Y3GktHYssRy7TAJQ2DyQ==",
-          "requires": {
-            "blakejs": "^1.1.0",
-            "buffer": "^5.4.3",
-            "err-code": "^2.0.0",
-            "js-sha3": "^0.8.0",
-            "multihashes": "^1.0.1",
-            "murmurhash3js-revisited": "^3.0.0"
-          }
-        }
-      }
-    },
-    "libp2p-record": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/libp2p-record/-/libp2p-record-0.7.3.tgz",
-      "integrity": "sha512-a6MrDeVqIkAUaDaiS3vWFu2OblpuBaBmY3bfQY+ZcEI/C2lWB0MixIby9RhrTmR+rqM+W3yoDLQa+clm1HVLhw==",
-      "requires": {
-        "buffer": "^5.6.0",
-        "err-code": "^2.0.0",
-        "multihashes": "~0.4.15",
-        "multihashing-async": "^0.8.0",
-        "protons": "^1.0.1"
-      },
-      "dependencies": {
-        "err-code": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
-          "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="
-        },
-        "js-sha3": {
-          "version": "0.8.0",
-          "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz",
-          "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q=="
-        },
-        "multibase": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/multibase/-/multibase-1.0.1.tgz",
-          "integrity": "sha512-KcCxpBVY8fdVKu4dJMAahq4F/2Z/9xqEjIiR7PiMe7LRGeorFn2NLmicN6nLBCqQvft6MG2Lc9X5P0IdyvnxEw==",
-          "requires": {
-            "base-x": "^3.0.8",
-            "buffer": "^5.5.0"
-          }
-        },
-        "multihashing-async": {
-          "version": "0.8.2",
-          "resolved": "https://registry.npmjs.org/multihashing-async/-/multihashing-async-0.8.2.tgz",
-          "integrity": "sha512-2lKa1autuCy8x7KIEj9aVNbAb3aIMRFYIwN7mq/zD4pxgNIVgGlm+f6GKY4880EOF2Y3GktHYssRy7TAJQ2DyQ==",
-          "requires": {
-            "blakejs": "^1.1.0",
-            "buffer": "^5.4.3",
-            "err-code": "^2.0.0",
-            "js-sha3": "^0.8.0",
-            "multihashes": "^1.0.1",
-            "murmurhash3js-revisited": "^3.0.0"
-          },
-          "dependencies": {
-            "multihashes": {
-              "version": "1.0.1",
-              "resolved": "https://registry.npmjs.org/multihashes/-/multihashes-1.0.1.tgz",
-              "integrity": "sha512-S27Tepg4i8atNiFaU5ZOm3+gl3KQlUanLs/jWcBxQHFttgq+5x1OgbQmf2d8axJ/48zYGBd/wT9d723USMFduw==",
-              "requires": {
-                "buffer": "^5.6.0",
-                "multibase": "^1.0.1",
-                "varint": "^5.0.0"
-              }
-            }
-          }
-        }
-      }
-    },
-    "libp2p-secio": {
-      "version": "0.12.6",
-      "resolved": "https://registry.npmjs.org/libp2p-secio/-/libp2p-secio-0.12.6.tgz",
-      "integrity": "sha512-SPuXcQsXXix7Lkmx5fv+woKay+DWycFxv7xkWi+8CD5oa15/4U1E8qqqnE7Lwjj2Ub1i0DuE74GRRzap46sxTQ==",
-      "requires": {
-        "bl": "^4.0.0",
-        "debug": "^4.1.1",
-        "it-length-prefixed": "^3.0.1",
-        "it-pair": "^1.0.0",
-        "it-pb-rpc": "^0.1.4",
-        "it-pipe": "^1.1.0",
-        "libp2p-crypto": "^0.17.3",
-        "libp2p-interfaces": "^0.2.1",
-        "multiaddr": "^7.2.1",
-        "multihashing-async": "^0.8.0",
-        "peer-id": "^0.13.6",
-        "protons": "^1.0.2"
-      },
-      "dependencies": {
-        "bl": {
-          "version": "4.0.2",
-          "resolved": "https://registry.npmjs.org/bl/-/bl-4.0.2.tgz",
-          "integrity": "sha512-j4OH8f6Qg2bGuWfRiltT2HYGx0e1QcBTrK9KAHNMwMZdQnDZFk0ZSYIpADjYCB3U12nicC5tVJwSIhwOWjb4RQ==",
-          "requires": {
-            "buffer": "^5.5.0",
-            "inherits": "^2.0.4",
-            "readable-stream": "^3.4.0"
-          }
-        },
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "err-code": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
-          "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="
-        },
-        "js-sha3": {
-          "version": "0.8.0",
-          "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz",
-          "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q=="
-        },
-        "libp2p-crypto": {
-<<<<<<< dev-2
-          "version": "0.17.9",
-          "resolved": "https://registry.npmjs.org/libp2p-crypto/-/libp2p-crypto-0.17.9.tgz",
-          "integrity": "sha512-nH3vTfQ4UqhZ1SORTP7HOsmFdJBs604Qy0Xi3IFFtU6ofYt+rFAZ2QNgo4MH1ZTT38/LEM374N9K7yzj1IQm0g==",
-=======
-          "version": "0.17.8",
-          "resolved": "https://registry.npmjs.org/libp2p-crypto/-/libp2p-crypto-0.17.8.tgz",
-          "integrity": "sha512-jm5k4oqgV8NX9so65meWBkGC5bk6zvXyXWZKKUcnQcHHKnHUhuhIopSxIoBi5MDOrI1iLxn19+YOBFgSHkSaiA==",
->>>>>>> remove webpack from dependencies
-          "requires": {
-            "buffer": "^5.5.0",
-            "err-code": "^2.0.0",
-            "is-typedarray": "^1.0.0",
-            "iso-random-stream": "^1.1.0",
-            "keypair": "^1.0.1",
-<<<<<<< dev-2
-            "multibase": "^1.0.1",
-            "multicodec": "^1.0.4",
-            "multihashing-async": "^0.8.1",
-            "node-forge": "^0.9.1",
-            "pem-jwk": "^2.0.0",
-            "protons": "^1.2.1",
-            "secp256k1": "^4.0.0",
-            "uint8arrays": "^1.0.0",
-            "ursa-optional": "^0.10.1"
-=======
-            "multibase": "^0.7.0",
-            "multihashing-async": "^0.8.1",
-            "node-forge": "^0.9.1",
-            "pem-jwk": "^2.0.0",
-            "protons": "^1.0.1",
-            "secp256k1": "^4.0.0",
-            "ursa-optional": "~0.10.1"
->>>>>>> remove webpack from dependencies
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-        },
-<<<<<<< dev-2
-        "multibase": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/multibase/-/multibase-1.0.1.tgz",
-          "integrity": "sha512-KcCxpBVY8fdVKu4dJMAahq4F/2Z/9xqEjIiR7PiMe7LRGeorFn2NLmicN6nLBCqQvft6MG2Lc9X5P0IdyvnxEw==",
-          "requires": {
-            "base-x": "^3.0.8",
-            "buffer": "^5.5.0"
-          }
-        },
         "multicodec": {
           "version": "1.0.4",
           "resolved": "https://registry.npmjs.org/multicodec/-/multicodec-1.0.4.tgz",
@@ -33313,8 +29933,6 @@
             "varint": "^5.0.0"
           }
         },
-=======
->>>>>>> remove webpack from dependencies
         "multihashes": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/multihashes/-/multihashes-1.0.1.tgz",
@@ -33323,8 +29941,6 @@
             "buffer": "^5.6.0",
             "multibase": "^1.0.1",
             "varint": "^5.0.0"
-<<<<<<< dev-2
-=======
           },
           "dependencies": {
             "multibase": {
@@ -33336,7 +29952,180 @@
                 "buffer": "^5.5.0"
               }
             }
->>>>>>> remove webpack from dependencies
+          }
+        },
+        "multihashing-async": {
+          "version": "0.8.2",
+          "resolved": "https://registry.npmjs.org/multihashing-async/-/multihashing-async-0.8.2.tgz",
+          "integrity": "sha512-2lKa1autuCy8x7KIEj9aVNbAb3aIMRFYIwN7mq/zD4pxgNIVgGlm+f6GKY4880EOF2Y3GktHYssRy7TAJQ2DyQ==",
+          "requires": {
+            "blakejs": "^1.1.0",
+            "buffer": "^5.4.3",
+            "err-code": "^2.0.0",
+            "js-sha3": "^0.8.0",
+            "multihashes": "^1.0.1",
+            "murmurhash3js-revisited": "^3.0.0"
+          }
+        }
+      }
+    },
+    "libp2p-record": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/libp2p-record/-/libp2p-record-0.7.3.tgz",
+      "integrity": "sha512-a6MrDeVqIkAUaDaiS3vWFu2OblpuBaBmY3bfQY+ZcEI/C2lWB0MixIby9RhrTmR+rqM+W3yoDLQa+clm1HVLhw==",
+      "requires": {
+        "buffer": "^5.6.0",
+        "err-code": "^2.0.0",
+        "multihashes": "~0.4.15",
+        "multihashing-async": "^0.8.0",
+        "protons": "^1.0.1"
+      },
+      "dependencies": {
+        "err-code": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
+          "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="
+        },
+        "js-sha3": {
+          "version": "0.8.0",
+          "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz",
+          "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q=="
+        },
+        "multibase": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/multibase/-/multibase-1.0.1.tgz",
+          "integrity": "sha512-KcCxpBVY8fdVKu4dJMAahq4F/2Z/9xqEjIiR7PiMe7LRGeorFn2NLmicN6nLBCqQvft6MG2Lc9X5P0IdyvnxEw==",
+          "requires": {
+            "base-x": "^3.0.8",
+            "buffer": "^5.5.0"
+          }
+        },
+        "multihashing-async": {
+          "version": "0.8.2",
+          "resolved": "https://registry.npmjs.org/multihashing-async/-/multihashing-async-0.8.2.tgz",
+          "integrity": "sha512-2lKa1autuCy8x7KIEj9aVNbAb3aIMRFYIwN7mq/zD4pxgNIVgGlm+f6GKY4880EOF2Y3GktHYssRy7TAJQ2DyQ==",
+          "requires": {
+            "blakejs": "^1.1.0",
+            "buffer": "^5.4.3",
+            "err-code": "^2.0.0",
+            "js-sha3": "^0.8.0",
+            "multihashes": "^1.0.1",
+            "murmurhash3js-revisited": "^3.0.0"
+          },
+          "dependencies": {
+            "multihashes": {
+              "version": "1.0.1",
+              "resolved": "https://registry.npmjs.org/multihashes/-/multihashes-1.0.1.tgz",
+              "integrity": "sha512-S27Tepg4i8atNiFaU5ZOm3+gl3KQlUanLs/jWcBxQHFttgq+5x1OgbQmf2d8axJ/48zYGBd/wT9d723USMFduw==",
+              "requires": {
+                "buffer": "^5.6.0",
+                "multibase": "^1.0.1",
+                "varint": "^5.0.0"
+              }
+            }
+          }
+        }
+      }
+    },
+    "libp2p-secio": {
+      "version": "0.12.6",
+      "resolved": "https://registry.npmjs.org/libp2p-secio/-/libp2p-secio-0.12.6.tgz",
+      "integrity": "sha512-SPuXcQsXXix7Lkmx5fv+woKay+DWycFxv7xkWi+8CD5oa15/4U1E8qqqnE7Lwjj2Ub1i0DuE74GRRzap46sxTQ==",
+      "requires": {
+        "bl": "^4.0.0",
+        "debug": "^4.1.1",
+        "it-length-prefixed": "^3.0.1",
+        "it-pair": "^1.0.0",
+        "it-pb-rpc": "^0.1.4",
+        "it-pipe": "^1.1.0",
+        "libp2p-crypto": "^0.17.3",
+        "libp2p-interfaces": "^0.2.1",
+        "multiaddr": "^7.2.1",
+        "multihashing-async": "^0.8.0",
+        "peer-id": "^0.13.6",
+        "protons": "^1.0.2"
+      },
+      "dependencies": {
+        "bl": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/bl/-/bl-4.0.2.tgz",
+          "integrity": "sha512-j4OH8f6Qg2bGuWfRiltT2HYGx0e1QcBTrK9KAHNMwMZdQnDZFk0ZSYIpADjYCB3U12nicC5tVJwSIhwOWjb4RQ==",
+          "requires": {
+            "buffer": "^5.5.0",
+            "inherits": "^2.0.4",
+            "readable-stream": "^3.4.0"
+          }
+        },
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        },
+        "err-code": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz",
+          "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="
+        },
+        "js-sha3": {
+          "version": "0.8.0",
+          "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.8.0.tgz",
+          "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q=="
+        },
+        "libp2p-crypto": {
+          "version": "0.17.9",
+          "resolved": "https://registry.npmjs.org/libp2p-crypto/-/libp2p-crypto-0.17.9.tgz",
+          "integrity": "sha512-nH3vTfQ4UqhZ1SORTP7HOsmFdJBs604Qy0Xi3IFFtU6ofYt+rFAZ2QNgo4MH1ZTT38/LEM374N9K7yzj1IQm0g==",
+          "requires": {
+            "buffer": "^5.5.0",
+            "err-code": "^2.0.0",
+            "is-typedarray": "^1.0.0",
+            "iso-random-stream": "^1.1.0",
+            "keypair": "^1.0.1",
+            "multibase": "^1.0.1",
+            "multicodec": "^1.0.4",
+            "multihashing-async": "^0.8.1",
+            "node-forge": "^0.9.1",
+            "pem-jwk": "^2.0.0",
+            "protons": "^1.2.1",
+            "secp256k1": "^4.0.0",
+            "uint8arrays": "^1.0.0",
+            "ursa-optional": "^0.10.1"
+          }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+        },
+        "multibase": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/multibase/-/multibase-1.0.1.tgz",
+          "integrity": "sha512-KcCxpBVY8fdVKu4dJMAahq4F/2Z/9xqEjIiR7PiMe7LRGeorFn2NLmicN6nLBCqQvft6MG2Lc9X5P0IdyvnxEw==",
+          "requires": {
+            "base-x": "^3.0.8",
+            "buffer": "^5.5.0"
+          }
+        },
+        "multicodec": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/multicodec/-/multicodec-1.0.4.tgz",
+          "integrity": "sha512-NDd7FeS3QamVtbgfvu5h7fd1IlbaC4EQ0/pgU4zqE2vdHCmBGsUa0TiM8/TdSeG6BMPC92OOCf8F1ocE/Wkrrg==",
+          "requires": {
+            "buffer": "^5.6.0",
+            "varint": "^5.0.0"
+          }
+        },
+        "multihashes": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/multihashes/-/multihashes-1.0.1.tgz",
+          "integrity": "sha512-S27Tepg4i8atNiFaU5ZOm3+gl3KQlUanLs/jWcBxQHFttgq+5x1OgbQmf2d8axJ/48zYGBd/wT9d723USMFduw==",
+          "requires": {
+            "buffer": "^5.6.0",
+            "multibase": "^1.0.1",
+            "varint": "^5.0.0"
           }
         },
         "multihashing-async": {
@@ -34894,10 +31683,6 @@
         "regex-not": "^1.0.0",
         "snapdragon": "^0.8.1",
         "to-regex": "^3.0.2"
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
->>>>>>> package-lock
       },
       "dependencies": {
         "braces": {
@@ -35019,11 +31804,6 @@
             "repeat-string": "^1.6.1"
           }
         }
-<<<<<<< dev-2
-=======
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
       }
     },
     "miller-rabin": {
@@ -35223,21 +32003,9 @@
       }
     },
     "minipass-pipeline": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
-      "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
-=======
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.3.tgz",
-      "integrity": "sha512-cFOknTvng5vqnwOpDsZTWhNll6Jf8o2x+/diplafmxpuIymAjzoOolZG0VvQf3V2HgqzJNhnuKHYp2BqDgz8IQ==",
->>>>>>> remove webpack from dependencies
-=======
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
       "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
->>>>>>> package-lock
       "dev": true,
       "requires": {
         "minipass": "^3.0.0"
@@ -35360,21 +32128,9 @@
       "integrity": "sha512-hzk17T+/IIYLPWClRcfoA6Q5aZhFpDCr1oh8RZzu+esWP77IX/lS0V/Ee1Np+aOPKFfbSInF0reHH0L/aFfSrw=="
     },
     "mobx-react": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-      "version": "6.2.5",
-      "resolved": "https://registry.npmjs.org/mobx-react/-/mobx-react-6.2.5.tgz",
-      "integrity": "sha512-LxtXXW0GkOAO6VOIg2m/6WL6ZuKlzOWwESIFdrWelI0ZMIvtKCMZVUuulcO5GAWSDsH0ApaMkGLoaPqKjzyziQ==",
-=======
-      "version": "6.2.3",
-      "resolved": "https://registry.npmjs.org/mobx-react/-/mobx-react-6.2.3.tgz",
-      "integrity": "sha512-XHEEmGCjWKD1YtEJgELYdWc2N0y1c5t4zA8OedJCq1FnRizvc59NX3EeEmEkPznftvjuVBehugmLq9kHdVxYtA==",
->>>>>>> remove webpack from dependencies
-=======
       "version": "6.2.5",
       "resolved": "https://registry.npmjs.org/mobx-react/-/mobx-react-6.2.5.tgz",
       "integrity": "sha512-LxtXXW0GkOAO6VOIg2m/6WL6ZuKlzOWwESIFdrWelI0ZMIvtKCMZVUuulcO5GAWSDsH0ApaMkGLoaPqKjzyziQ==",
->>>>>>> package-lock
       "requires": {
         "mobx-react-lite": ">=2.0.6"
       }
@@ -35432,21 +32188,6 @@
             "color-convert": "^1.9.0"
           }
         },
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
-        "braces": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-          "dev": true,
-          "requires": {
-            "fill-range": "^7.0.1"
-          }
-        },
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
         "chalk": {
           "version": "2.4.2",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
@@ -35494,21 +32235,6 @@
             "ms": "^2.1.1"
           }
         },
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
-        "fill-range": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-          "dev": true,
-          "requires": {
-            "to-regex-range": "^5.0.1"
-          }
-        },
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
         "find-up": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
@@ -35519,18 +32245,6 @@
             "path-exists": "^4.0.0"
           }
         },
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
-        "is-number": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-          "dev": true
-        },
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
         "js-yaml": {
           "version": "3.13.1",
           "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
@@ -35621,21 +32335,6 @@
             }
           }
         },
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
-        "to-regex-range": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-          "dev": true,
-          "requires": {
-            "is-number": "^7.0.0"
-          }
-        },
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
         "which": {
           "version": "2.0.2",
           "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -35989,15 +32688,9 @@
       "integrity": "sha1-DMj20OK2IrR5xA1JnEbWS3Vcb18="
     },
     "nanoid": {
-<<<<<<< dev-2
       "version": "3.1.12",
       "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.12.tgz",
       "integrity": "sha512-1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A=="
-=======
-      "version": "2.1.11",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-2.1.11.tgz",
-      "integrity": "sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA=="
->>>>>>> remove webpack from dependencies
     },
     "nanomatch": {
       "version": "1.2.13",
@@ -36016,10 +32709,6 @@
         "regex-not": "^1.0.0",
         "snapdragon": "^0.8.1",
         "to-regex": "^3.0.1"
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
->>>>>>> package-lock
       },
       "dependencies": {
         "define-property": {
@@ -36051,11 +32740,6 @@
             "is-plain-object": "^2.0.4"
           }
         }
-<<<<<<< dev-2
-=======
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
       }
     },
     "napi-build-utils": {
@@ -36593,10 +33277,6 @@
             "is-descriptor": "^0.1.0"
           }
         },
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
->>>>>>> package-lock
         "is-accessor-descriptor": {
           "version": "0.1.6",
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
@@ -36606,21 +33286,12 @@
             "kind-of": "^3.0.2"
           }
         },
-<<<<<<< dev-2
-=======
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
         "is-buffer": {
           "version": "1.1.6",
           "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
           "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
           "dev": true
         },
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
->>>>>>> package-lock
         "is-data-descriptor": {
           "version": "0.1.4",
           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
@@ -36649,11 +33320,6 @@
             }
           }
         },
-<<<<<<< dev-2
-=======
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
         "kind-of": {
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
@@ -37832,22 +34498,15 @@
           "integrity": "sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q=="
         },
         "libp2p-crypto": {
-<<<<<<< dev-2
           "version": "0.17.9",
           "resolved": "https://registry.npmjs.org/libp2p-crypto/-/libp2p-crypto-0.17.9.tgz",
           "integrity": "sha512-nH3vTfQ4UqhZ1SORTP7HOsmFdJBs604Qy0Xi3IFFtU6ofYt+rFAZ2QNgo4MH1ZTT38/LEM374N9K7yzj1IQm0g==",
-=======
-          "version": "0.17.8",
-          "resolved": "https://registry.npmjs.org/libp2p-crypto/-/libp2p-crypto-0.17.8.tgz",
-          "integrity": "sha512-jm5k4oqgV8NX9so65meWBkGC5bk6zvXyXWZKKUcnQcHHKnHUhuhIopSxIoBi5MDOrI1iLxn19+YOBFgSHkSaiA==",
->>>>>>> remove webpack from dependencies
           "requires": {
             "buffer": "^5.5.0",
             "err-code": "^2.0.0",
             "is-typedarray": "^1.0.0",
             "iso-random-stream": "^1.1.0",
             "keypair": "^1.0.1",
-<<<<<<< dev-2
             "multibase": "^1.0.1",
             "multicodec": "^1.0.4",
             "multihashing-async": "^0.8.1",
@@ -37857,26 +34516,6 @@
             "secp256k1": "^4.0.0",
             "uint8arrays": "^1.0.0",
             "ursa-optional": "^0.10.1"
-=======
-            "multibase": "^0.7.0",
-            "multihashing-async": "^0.8.1",
-            "node-forge": "^0.9.1",
-            "pem-jwk": "^2.0.0",
-            "protons": "^1.0.1",
-            "secp256k1": "^4.0.0",
-            "ursa-optional": "~0.10.1"
-          },
-          "dependencies": {
-            "multibase": {
-              "version": "0.7.0",
-              "resolved": "https://registry.npmjs.org/multibase/-/multibase-0.7.0.tgz",
-              "integrity": "sha512-TW8q03O0f6PNFTQDvh3xxH03c8CjGaaYrjkl9UQPG6rz53TQzzxJVCIWVjzcbN/Q5Y53Zd0IBQBMVktVgNx4Fg==",
-              "requires": {
-                "base-x": "^3.0.8",
-                "buffer": "^5.5.0"
-              }
-            }
->>>>>>> remove webpack from dependencies
           }
         },
         "multibase": {
@@ -38221,34 +34860,14 @@
       "integrity": "sha512-Kjw8nKRl1m+VrSFCoVGPph93W/qrSO7ZkqPpTf7F4bk/sqcfWK019dWBUpE/fBOsOQY1dks/Bmcbfn1heM/IsA=="
     },
     "portfinder": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-      "version": "1.0.28",
-      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz",
-      "integrity": "sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==",
-=======
-      "version": "1.0.27",
-      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.27.tgz",
-      "integrity": "sha512-bJ3U3MThKnyJ9Dx1Idtm5pQmxXqw08+XOHhi/Lie8OF1OlhVaBFhsntAIhkZYjfDcCzszSr0w1yCbccThhzgxQ==",
->>>>>>> remove webpack from dependencies
-=======
       "version": "1.0.28",
       "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz",
       "integrity": "sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==",
->>>>>>> package-lock
       "dev": true,
       "requires": {
         "async": "^2.6.2",
         "debug": "^3.1.1",
-<<<<<<< dev-2
-<<<<<<< dev-2
         "mkdirp": "^0.5.5"
-=======
-        "mkdirp": "^0.5.1"
->>>>>>> remove webpack from dependencies
-=======
-        "mkdirp": "^0.5.5"
->>>>>>> package-lock
       },
       "dependencies": {
         "debug": {
@@ -40950,40 +37569,14 @@
         "toggle-array": "^1.0.1"
       },
       "dependencies": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
->>>>>>> package-lock
         "define-property": {
           "version": "2.0.2",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
           "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
-<<<<<<< dev-2
           "dev": true,
           "requires": {
             "is-descriptor": "^1.0.2",
             "isobject": "^3.0.1"
-=======
-        "is-number": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-6.0.0.tgz",
-          "integrity": "sha512-Wu1VHeILBK8KAWJUAiSZQX94GmOE45Rg6/538fKwiloUu21KncEkYGPqob2oSZ5mUT73vLGrHQjKw3KMPwfDzg==",
-          "dev": true
-        },
-        "set-value": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/set-value/-/set-value-3.0.2.tgz",
-          "integrity": "sha512-npjkVoz+ank0zjlV9F47Fdbjfj/PfXyVhZvGALWsyIYU/qrMzpi6avjKW3/7KeSU2Df3I46BrN1xOI1+6vW0hA==",
-          "dev": true,
-          "requires": {
-            "is-plain-object": "^2.0.4"
->>>>>>> remove webpack from dependencies
-=======
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^1.0.2",
-            "isobject": "^3.0.1"
->>>>>>> package-lock
           }
         }
       }
@@ -41034,74 +37627,6 @@
             "ms": "^2.1.1"
           }
         },
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "6.0.3",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-              "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-              "dev": true
-            }
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "6.0.3",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-              "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-              "dev": true
-            }
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "6.0.3",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-              "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-              "dev": true
-            }
-          }
-        },
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
         "kind-of": {
           "version": "5.1.0",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
@@ -41631,21 +38156,9 @@
       }
     },
     "ramda": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-      "version": "0.27.1",
-      "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.27.1.tgz",
-      "integrity": "sha512-PgIdVpn5y5Yns8vqb8FzBUEYn98V3xcPgawAkkgj0YJ0qDsnHCiNmZYfOGMgOvoB0eWFLpYbhxUR3mxfDIMvpw=="
-=======
-      "version": "0.27.0",
-      "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.27.0.tgz",
-      "integrity": "sha512-pVzZdDpWwWqEVVLshWUHjNwuVP7SfcmPraYuqocJp1yo2U1R7P+5QAfDhdItkuoGqIBnBYrtPp7rEPqDn9HlZA=="
->>>>>>> remove webpack from dependencies
-=======
       "version": "0.27.1",
       "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.27.1.tgz",
       "integrity": "sha512-PgIdVpn5y5Yns8vqb8FzBUEYn98V3xcPgawAkkgj0YJ0qDsnHCiNmZYfOGMgOvoB0eWFLpYbhxUR3mxfDIMvpw=="
->>>>>>> package-lock
     },
     "ramdasauce": {
       "version": "2.1.3",
@@ -41837,13 +38350,16 @@
       }
     },
     "react-autosuggest": {
-      "version": "9.4.3",
-      "resolved": "https://registry.npmjs.org/react-autosuggest/-/react-autosuggest-9.4.3.tgz",
-      "integrity": "sha512-wFbp5QpgFQRfw9cwKvcgLR8theikOUkv8PFsuLYqI2PUgVlx186Cz8MYt5bLxculi+jxGGUUVt+h0esaBZZouw==",
+      "version": "10.0.2",
+      "resolved": "https://registry.npmjs.org/react-autosuggest/-/react-autosuggest-10.0.2.tgz",
+      "integrity": "sha512-ouI0RJDSgM1FBfK0ZmLC3qUqithIwPVTpnC4JQW4DeId3mH2JnZmkNNDKImhcMrxLbSQRpV/DfTLn0uCs4b27w==",
       "requires": {
-        "prop-types": "^15.5.10",
-        "react-autowhatever": "^10.1.2",
-        "shallow-equal": "^1.0.0"
+        "es6-promise": "^4.2.8",
+        "prop-types": "^15.7.2",
+        "react-autowhatever": "^10.2.1",
+        "react-themeable": "^1.1.0",
+        "section-iterator": "^2.0.0",
+        "shallow-equal": "^1.2.1"
       }
     },
     "react-autowhatever": {
@@ -42398,10 +38914,6 @@
         "prop-types": "^15.6.1"
       }
     },
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
->>>>>>> merge conflict errors
     "react-i18next": {
       "version": "9.0.10",
       "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-9.0.10.tgz",
@@ -42422,11 +38934,6 @@
         }
       }
     },
-<<<<<<< dev-2
-=======
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> merge conflict errors
     "react-image-lightbox": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/react-image-lightbox/-/react-image-lightbox-5.1.0.tgz",
@@ -42954,10 +39461,6 @@
       "resolved": "https://registry.npmjs.org/readable-web-to-node-stream/-/readable-web-to-node-stream-2.0.0.tgz",
       "integrity": "sha512-+oZJurc4hXpaaqsN68GoZGQAQIA3qr09Or4fqEsargABnbe5Aau8hFn6ISVleT3cpY/0n/8drn7huyyEvTbghA=="
     },
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
->>>>>>> package-lock
     "readdir-glob": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.0.0.tgz",
@@ -42967,11 +39470,6 @@
         "minimatch": "^3.0.4"
       }
     },
-<<<<<<< dev-2
-=======
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
     "readdirp": {
       "version": "3.4.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz",
@@ -43037,30 +39535,11 @@
         "window-size": "^1.1.0"
       },
       "dependencies": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
         "is-buffer": {
           "version": "1.1.6",
           "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
           "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
           "dev": true
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
->>>>>>> package-lock
         },
         "is-number": {
           "version": "3.0.0",
@@ -43079,11 +39558,6 @@
           "requires": {
             "is-buffer": "^1.1.5"
           }
-<<<<<<< dev-2
-=======
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
         }
       }
     },
@@ -43268,10 +39742,6 @@
       "requires": {
         "extend-shallow": "^3.0.2",
         "safe-regex": "^1.1.0"
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
->>>>>>> package-lock
       },
       "dependencies": {
         "extend-shallow": {
@@ -43293,11 +39763,6 @@
             "is-plain-object": "^2.0.4"
           }
         }
-<<<<<<< dev-2
-=======
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
       }
     },
     "regexp.prototype.flags": {
@@ -43776,7 +40241,6 @@
         "bn.js": "^4.11.1"
       }
     },
-<<<<<<< dev-2
     "rpc-utils": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/rpc-utils/-/rpc-utils-0.1.2.tgz",
@@ -43785,8 +40249,6 @@
         "nanoid": "^3.1.11"
       }
     },
-=======
->>>>>>> remove webpack from dependencies
     "rsa-pem-to-jwk": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/rsa-pem-to-jwk/-/rsa-pem-to-jwk-1.1.3.tgz",
@@ -44399,44 +40861,12 @@
       "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E="
     },
     "set-value": {
-<<<<<<< dev-2
-<<<<<<< dev-2
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/set-value/-/set-value-3.0.2.tgz",
       "integrity": "sha512-npjkVoz+ank0zjlV9F47Fdbjfj/PfXyVhZvGALWsyIYU/qrMzpi6avjKW3/7KeSU2Df3I46BrN1xOI1+6vW0hA==",
       "dev": true,
       "requires": {
         "is-plain-object": "^2.0.4"
-=======
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
-      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
-      "dev": true,
-      "requires": {
-        "extend-shallow": "^2.0.1",
-        "is-extendable": "^0.1.1",
-        "is-plain-object": "^2.0.3",
-        "split-string": "^3.0.1"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
->>>>>>> remove webpack from dependencies
-=======
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/set-value/-/set-value-3.0.2.tgz",
-      "integrity": "sha512-npjkVoz+ank0zjlV9F47Fdbjfj/PfXyVhZvGALWsyIYU/qrMzpi6avjKW3/7KeSU2Df3I46BrN1xOI1+6vW0hA==",
-      "dev": true,
-      "requires": {
-        "is-plain-object": "^2.0.4"
->>>>>>> package-lock
       }
     },
     "setimmediate": {
@@ -44549,7 +40979,6 @@
       "integrity": "sha512-5EaCy2mx2Jgc/Fdn9uuDuNIIfWBpzY4XIlhoqtXF6qsf+/+SGZ+FxDdX/ZsMZiWupIWNqAEmiNY4RC+LSmCeOw==",
       "requires": {
         "nanoid": "^2.1.0"
-<<<<<<< dev-2
       },
       "dependencies": {
         "nanoid": {
@@ -44557,8 +40986,6 @@
           "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-2.1.11.tgz",
           "integrity": "sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA=="
         }
-=======
->>>>>>> remove webpack from dependencies
       }
     },
     "side-channel": {
@@ -44777,8 +41204,6 @@
             "is-descriptor": "^0.1.0"
           }
         },
-<<<<<<< dev-2
-<<<<<<< dev-2
         "is-accessor-descriptor": {
           "version": "0.1.6",
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
@@ -44841,16 +41266,6 @@
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
           "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
           "dev": true
-=======
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
->>>>>>> remove webpack from dependencies
         }
       }
     },
@@ -44863,96 +41278,6 @@
         "define-property": "^1.0.0",
         "isobject": "^3.0.0",
         "snapdragon-util": "^3.0.1"
-<<<<<<< dev-2
-=======
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        },
-=======
->>>>>>> package-lock
-        "is-accessor-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-          "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-          "dev": true
-        },
-        "is-data-descriptor": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-          "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
-        "is-descriptor": {
-          "version": "0.1.6",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-          "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^0.1.6",
-            "is-data-descriptor": "^0.1.4",
-            "kind-of": "^5.0.0"
-          }
-        },
-        "kind-of": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-          "dev": true
-        }
->>>>>>> remove webpack from dependencies
-      }
-    },
-    "snapdragon-node": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
-      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
-      "dev": true,
-      "requires": {
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.0",
-        "snapdragon-util": "^3.0.1"
       }
     },
     "snapdragon-util": {
@@ -45439,10 +41764,6 @@
       "dev": true,
       "requires": {
         "extend-shallow": "^3.0.0"
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
->>>>>>> package-lock
       },
       "dependencies": {
         "extend-shallow": {
@@ -45464,11 +41785,6 @@
             "is-plain-object": "^2.0.4"
           }
         }
-<<<<<<< dev-2
-=======
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
       }
     },
     "split2": {
@@ -45561,10 +41877,6 @@
           "requires": {
             "is-descriptor": "^0.1.0"
           }
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
->>>>>>> package-lock
         },
         "is-accessor-descriptor": {
           "version": "0.1.6",
@@ -45628,11 +41940,6 @@
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
           "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
           "dev": true
-<<<<<<< dev-2
-=======
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
         }
       }
     },
@@ -46566,23 +42873,6 @@
         "debug": "^2.6.6",
         "extend-shallow": "^2.0.1",
         "log-utils": "^0.2.1"
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
       }
     },
     "terser": {
@@ -46663,33 +42953,6 @@
             "unique-filename": "^1.1.1"
           }
         },
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
-        "find-cache-dir": {
-          "version": "3.3.1",
-          "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz",
-          "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==",
-          "dev": true,
-          "requires": {
-            "commondir": "^1.0.1",
-            "make-dir": "^3.0.2",
-            "pkg-dir": "^4.1.0"
-          }
-        },
-        "find-up": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^5.0.0",
-            "path-exists": "^4.0.0"
-          }
-        },
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
         "fs-minipass": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
@@ -46715,21 +42978,6 @@
             "supports-color": "^7.0.0"
           }
         },
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
-        "locate-path": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^4.1.0"
-          }
-        },
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
         "lru-cache": {
           "version": "5.1.1",
           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
@@ -46747,21 +42995,6 @@
             }
           }
         },
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
-        "make-dir": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-          "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-          "dev": true,
-          "requires": {
-            "semver": "^6.0.0"
-          }
-        },
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
         "minipass": {
           "version": "3.1.3",
           "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
@@ -46780,21 +43013,6 @@
             "minimist": "^1.2.5"
           }
         },
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
-        "p-locate": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.2.0"
-          }
-        },
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
         "p-map": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz",
@@ -46804,27 +43022,6 @@
             "aggregate-error": "^3.0.0"
           }
         },
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
-        "path-exists": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-          "dev": true
-        },
-        "pkg-dir": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-          "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-          "dev": true,
-          "requires": {
-            "find-up": "^4.0.0"
-          }
-        },
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
         "rimraf": {
           "version": "2.7.1",
           "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
@@ -47101,10 +43298,6 @@
         "extend-shallow": "^3.0.2",
         "regex-not": "^1.0.2",
         "safe-regex": "^1.1.0"
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
->>>>>>> package-lock
       },
       "dependencies": {
         "define-property": {
@@ -47136,7 +43329,6 @@
             "is-plain-object": "^2.0.4"
           }
         }
-<<<<<<< dev-2
       }
     },
     "to-regex-range": {
@@ -47154,32 +43346,6 @@
           "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
           "dev": true
         }
-=======
-=======
->>>>>>> package-lock
-      }
-    },
-    "to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
-      "requires": {
-<<<<<<< dev-2
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
->>>>>>> remove webpack from dependencies
-=======
-        "is-number": "^7.0.0"
-      },
-      "dependencies": {
-        "is-number": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-          "dev": true
-        }
->>>>>>> package-lock
       }
     },
     "toggle-array": {
@@ -47785,10 +43951,6 @@
         "worker-farm": "^1.7.0"
       },
       "dependencies": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
->>>>>>> package-lock
         "find-cache-dir": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
@@ -47822,11 +43984,6 @@
           "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
           "dev": true
         },
-<<<<<<< dev-2
-=======
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
         "serialize-javascript": {
           "version": "1.9.1",
           "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.9.1.tgz",
@@ -47841,7 +43998,6 @@
         }
       }
     },
-<<<<<<< dev-2
     "uint8arrays": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/uint8arrays/-/uint8arrays-1.1.0.tgz",
@@ -47862,8 +44018,6 @@
         }
       }
     },
-=======
->>>>>>> remove webpack from dependencies
     "ultron": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
@@ -47949,10 +44103,6 @@
         "get-value": "^2.0.6",
         "is-extendable": "^0.1.1",
         "set-value": "^2.0.1"
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
->>>>>>> package-lock
       },
       "dependencies": {
         "set-value": {
@@ -47967,11 +44117,6 @@
             "split-string": "^3.0.1"
           }
         }
-<<<<<<< dev-2
-=======
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
       }
     },
     "uniq": {
@@ -48327,30 +44472,12 @@
       "dev": true
     },
     "use-sidecar": {
-<<<<<<< dev-2
-<<<<<<< dev-2
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/use-sidecar/-/use-sidecar-1.0.3.tgz",
       "integrity": "sha512-ygJwGUBeQfWgDls7uTrlEDzJUUR67L8Rm14v/KfFtYCdHhtjHZx1Krb3DIQl3/Q5dJGfXLEQ02RY8BdNBv87SQ==",
       "dev": true,
       "requires": {
         "detect-node-es": "^1.0.0",
-=======
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/use-sidecar/-/use-sidecar-1.0.2.tgz",
-      "integrity": "sha512-287RZny6m5KNMTb/Kq9gmjafi7lQL0YHO1lYolU6+tY1h9+Z3uCtkJJ3OSOq3INwYf2hBryCcDh4520AhJibMA==",
-      "dev": true,
-      "requires": {
-        "detect-node": "^2.0.4",
->>>>>>> remove webpack from dependencies
-=======
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/use-sidecar/-/use-sidecar-1.0.3.tgz",
-      "integrity": "sha512-ygJwGUBeQfWgDls7uTrlEDzJUUR67L8Rm14v/KfFtYCdHhtjHZx1Krb3DIQl3/Q5dJGfXLEQ02RY8BdNBv87SQ==",
-      "dev": true,
-      "requires": {
-        "detect-node-es": "^1.0.0",
->>>>>>> package-lock
         "tslib": "^1.9.3"
       }
     },
@@ -48553,20 +44680,11 @@
       "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
       "dev": true
     },
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
->>>>>>> merge conflict errors
     "void-elements": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
       "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w="
     },
-<<<<<<< dev-2
-=======
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> merge conflict errors
     "w3c-hr-time": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
@@ -48651,10 +44769,6 @@
           "dev": true,
           "optional": true
         },
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
->>>>>>> package-lock
         "braces": {
           "version": "2.3.2",
           "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
@@ -48674,11 +44788,6 @@
             "to-regex": "^3.0.1"
           }
         },
-<<<<<<< dev-2
-=======
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
         "chokidar": {
           "version": "2.1.8",
           "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
@@ -48700,10 +44809,6 @@
             "upath": "^1.1.1"
           }
         },
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
->>>>>>> package-lock
         "fill-range": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
@@ -48717,11 +44822,6 @@
             "to-regex-range": "^2.1.0"
           }
         },
-<<<<<<< dev-2
-=======
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
         "fsevents": {
           "version": "1.2.13",
           "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
@@ -48766,10 +44866,6 @@
             "binary-extensions": "^1.0.0"
           }
         },
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
->>>>>>> package-lock
         "is-buffer": {
           "version": "1.1.6",
           "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
@@ -48797,11 +44893,6 @@
             "is-buffer": "^1.1.5"
           }
         },
-<<<<<<< dev-2
-=======
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
         "readdirp": {
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
@@ -48813,10 +44904,6 @@
             "micromatch": "^3.1.10",
             "readable-stream": "^2.0.2"
           }
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
->>>>>>> package-lock
         },
         "to-regex-range": {
           "version": "2.1.1",
@@ -48828,11 +44915,6 @@
             "is-number": "^3.0.0",
             "repeat-string": "^1.6.1"
           }
-<<<<<<< dev-2
-=======
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
         }
       }
     },
@@ -48854,14 +44936,11 @@
         "defaults": "^1.0.3"
       }
     },
-<<<<<<< dev-2
     "web-encoding": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/web-encoding/-/web-encoding-1.0.2.tgz",
       "integrity": "sha512-fe9pqxglgy25Z4Ds+2GwZIrOnLxeozydMj0iV8zx0ZNxE3MPTseF4oXGrrBuH4vSkoDYDXoPRRFY/FEYitEUTA=="
     },
-=======
->>>>>>> remove webpack from dependencies
     "web3": {
       "version": "1.2.6",
       "resolved": "https://registry.npmjs.org/web3/-/web3-1.2.6.tgz",
@@ -49700,10 +45779,6 @@
         "xtend": "^4.0.1"
       },
       "dependencies": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
->>>>>>> package-lock
         "eth-json-rpc-errors": {
           "version": "2.0.2",
           "resolved": "https://registry.npmjs.org/eth-json-rpc-errors/-/eth-json-rpc-errors-2.0.2.tgz",
@@ -49712,11 +45787,6 @@
             "fast-safe-stringify": "^2.0.6"
           }
         },
-<<<<<<< dev-2
-=======
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
         "eth-json-rpc-infura": {
           "version": "4.0.2",
           "resolved": "https://registry.npmjs.org/eth-json-rpc-infura/-/eth-json-rpc-infura-4.0.2.tgz",
@@ -49854,47 +45924,15 @@
       }
     },
     "webdriver": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-<<<<<<< dev-2
-      "version": "6.3.6",
-      "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-6.3.6.tgz",
-      "integrity": "sha512-cp8RSA50rBGDRBUG7oG5tZYvnvwLIfJsGbVtC6/C2DIRSGDaJvPRIsO0pJh/QL9T+dxk/KkA8xhZTPheV98h2g==",
-=======
-      "version": "6.3.5",
-      "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-6.3.5.tgz",
-      "integrity": "sha512-UN5k34+Zo2KihVoFILFSXtk0trVUbOBC5XRXY0QtYEPbgZ2hSdzhnRlj+qDVvGBiC/zjPf8IV/C6avzThd/Y+g==",
->>>>>>> remove webpack from dependencies
-=======
-      "version": "6.3.6",
-      "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-6.3.6.tgz",
-      "integrity": "sha512-cp8RSA50rBGDRBUG7oG5tZYvnvwLIfJsGbVtC6/C2DIRSGDaJvPRIsO0pJh/QL9T+dxk/KkA8xhZTPheV98h2g==",
->>>>>>> package-lock
-=======
       "version": "6.4.0",
       "resolved": "https://registry.npmjs.org/webdriver/-/webdriver-6.4.0.tgz",
       "integrity": "sha512-yF5i2Wc6G+uQdEl3iAFpDPFP3xgfucUWaj6uXogEcMtq67SSIc4G9mq6vZCUF6F/GoW0H5c9F0L8ab8ZSTSX6w==",
->>>>>>> package-lock
       "dev": true,
       "requires": {
         "@wdio/config": "6.1.14",
         "@wdio/logger": "6.0.16",
-<<<<<<< dev-2
-<<<<<<< dev-2
-        "@wdio/protocols": "6.3.6",
-<<<<<<< dev-2
-        "@wdio/utils": "6.3.6",
-=======
-        "@wdio/protocols": "6.3.0",
-        "@wdio/utils": "6.3.0",
->>>>>>> remove webpack from dependencies
-=======
         "@wdio/protocols": "6.3.6",
-        "@wdio/utils": "6.3.6",
->>>>>>> package-lock
-=======
         "@wdio/utils": "6.4.0",
->>>>>>> package-lock
         "got": "^11.0.2",
         "lodash.merge": "^4.6.1"
       },
@@ -50017,65 +46055,20 @@
       }
     },
     "webdriverio": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-<<<<<<< dev-2
-      "version": "6.3.6",
-      "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-6.3.6.tgz",
-      "integrity": "sha512-srgbSrJrcuADCwu37iijat1Z8JckTbcqbSCCdyLHOWEe0CgFdLcYKK5dYfuTQPhqSv6XYgPXq1Fce6jzo7nShA==",
-=======
-      "version": "6.3.5",
-      "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-6.3.5.tgz",
-      "integrity": "sha512-hPREeod6pjPmZXpHI+ixRUeaVr/Ce2AwBfyttQlvL0GmsRgYSHKs5Dy7VWlvXmGhH/ahIJCOY0tccUPTXcGJPQ==",
->>>>>>> remove webpack from dependencies
-=======
-      "version": "6.3.6",
-      "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-6.3.6.tgz",
-      "integrity": "sha512-srgbSrJrcuADCwu37iijat1Z8JckTbcqbSCCdyLHOWEe0CgFdLcYKK5dYfuTQPhqSv6XYgPXq1Fce6jzo7nShA==",
->>>>>>> package-lock
-=======
       "version": "6.4.0",
       "resolved": "https://registry.npmjs.org/webdriverio/-/webdriverio-6.4.0.tgz",
       "integrity": "sha512-dtttlqvOLp5tCvCvT/A9Slau/W+9d2VtaMsL8awF9lPpjKMRBXRfD541CqU8fxnIl1XszqAAvcXdTJkqgtGPyg==",
->>>>>>> package-lock
       "dev": true,
       "requires": {
         "@types/puppeteer": "^3.0.1",
         "@wdio/config": "6.1.14",
         "@wdio/logger": "6.0.16",
-<<<<<<< dev-2
-<<<<<<< dev-2
-<<<<<<< dev-2
-        "@wdio/repl": "6.3.6",
-        "@wdio/utils": "6.3.6",
-        "archiver": "^5.0.0",
-        "atob": "^2.1.2",
-        "css-value": "^0.0.1",
-        "devtools": "6.3.6",
-=======
-        "@wdio/repl": "6.3.0",
-        "@wdio/utils": "6.3.0",
-        "archiver": "^4.0.1",
-        "atob": "^2.1.2",
-        "css-value": "^0.0.1",
-        "devtools": "6.3.4",
->>>>>>> remove webpack from dependencies
-=======
-        "@wdio/repl": "6.3.6",
-        "@wdio/utils": "6.3.6",
-        "archiver": "^5.0.0",
-        "atob": "^2.1.2",
-        "css-value": "^0.0.1",
-        "devtools": "6.3.6",
->>>>>>> package-lock
-=======
         "@wdio/repl": "6.4.0",
         "@wdio/utils": "6.4.0",
         "archiver": "^5.0.0",
         "atob": "^2.1.2",
         "css-value": "^0.0.1",
         "devtools": "6.4.0",
->>>>>>> package-lock
         "get-port": "^5.1.1",
         "grapheme-splitter": "^1.0.2",
         "lodash.clonedeep": "^4.5.0",
@@ -50087,19 +46080,7 @@
         "resq": "^1.6.0",
         "rgb2hex": "^0.2.0",
         "serialize-error": "^7.0.0",
-<<<<<<< dev-2
-<<<<<<< dev-2
-<<<<<<< dev-2
-        "webdriver": "6.3.6"
-=======
-        "webdriver": "6.3.5"
->>>>>>> remove webpack from dependencies
-=======
-        "webdriver": "6.3.6"
->>>>>>> package-lock
-=======
         "webdriver": "6.4.0"
->>>>>>> package-lock
       }
     },
     "webidl-conversions": {
@@ -50109,21 +46090,9 @@
       "dev": true
     },
     "webpack": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-      "version": "4.44.1",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.44.1.tgz",
-      "integrity": "sha512-4UOGAohv/VGUNQJstzEywwNxqX417FnjZgZJpJQegddzPmTvph37eBIRbRTfdySXzVtJXLJfbMN3mMYhM6GdmQ==",
-=======
-      "version": "4.44.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.44.0.tgz",
-      "integrity": "sha512-wAuJxK123sqAw31SpkPiPW3iKHgFUiKvO7E7UZjtdExcsRe3fgav4mvoMM7vvpjLHVoJ6a0Mtp2fzkoA13e0Zw==",
->>>>>>> remove webpack from dependencies
-=======
       "version": "4.44.1",
       "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.44.1.tgz",
       "integrity": "sha512-4UOGAohv/VGUNQJstzEywwNxqX417FnjZgZJpJQegddzPmTvph37eBIRbRTfdySXzVtJXLJfbMN3mMYhM6GdmQ==",
->>>>>>> package-lock
       "dev": true,
       "requires": {
         "@webassemblyjs/ast": "1.9.0",
@@ -50157,10 +46126,6 @@
           "integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==",
           "dev": true
         },
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
->>>>>>> package-lock
         "find-cache-dir": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
@@ -50182,11 +46147,6 @@
             "semver": "^5.6.0"
           }
         },
-<<<<<<< dev-2
-=======
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
         "mkdirp": {
           "version": "0.5.5",
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
@@ -50196,10 +46156,6 @@
             "minimist": "^1.2.5"
           }
         },
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
->>>>>>> package-lock
         "pify": {
           "version": "4.0.1",
           "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
@@ -50212,11 +46168,6 @@
           "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
           "dev": true
         },
-<<<<<<< dev-2
-=======
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -50489,10 +46440,6 @@
           "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
           "dev": true
         },
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
->>>>>>> package-lock
         "braces": {
           "version": "2.3.2",
           "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
@@ -50511,11 +46458,6 @@
             "to-regex": "^3.0.1"
           }
         },
-<<<<<<< dev-2
-=======
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
         "chokidar": {
           "version": "2.1.8",
           "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
@@ -50545,10 +46487,6 @@
             "ms": "^2.1.1"
           }
         },
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
->>>>>>> package-lock
         "fill-range": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
@@ -50561,11 +46499,6 @@
             "to-regex-range": "^2.1.0"
           }
         },
-<<<<<<< dev-2
-=======
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
         "fsevents": {
           "version": "1.2.13",
           "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
@@ -50613,10 +46546,6 @@
             "binary-extensions": "^1.0.0"
           }
         },
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
->>>>>>> package-lock
         "is-buffer": {
           "version": "1.1.6",
           "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
@@ -50641,11 +46570,6 @@
             "is-buffer": "^1.1.5"
           }
         },
-<<<<<<< dev-2
-=======
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
         "ms": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -50672,10 +46596,6 @@
             "has-flag": "^3.0.0"
           }
         },
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
->>>>>>> package-lock
         "to-regex-range": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
@@ -50686,11 +46606,6 @@
             "repeat-string": "^1.6.1"
           }
         },
-<<<<<<< dev-2
-=======
->>>>>>> remove webpack from dependencies
-=======
->>>>>>> package-lock
         "ws": {
           "version": "6.2.1",
           "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
@@ -50999,16 +46914,11 @@
         "is-number": "^3.0.0"
       },
       "dependencies": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-=======
->>>>>>> package-lock
         "is-buffer": {
           "version": "1.1.6",
           "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
           "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
           "dev": true
-<<<<<<< dev-2
         },
         "is-number": {
           "version": "3.0.0",
@@ -51026,50 +46936,6 @@
           "dev": true,
           "requires": {
             "is-buffer": "^1.1.5"
-=======
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-=======
->>>>>>> package-lock
-        },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          }
-        },
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-<<<<<<< dev-2
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
->>>>>>> remove webpack from dependencies
-=======
-            "is-buffer": "^1.1.5"
->>>>>>> package-lock
           }
         }
       }
@@ -51489,25 +47355,6 @@
       }
     },
     "zip-stream": {
-<<<<<<< dev-2
-<<<<<<< dev-2
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-4.0.2.tgz",
-      "integrity": "sha512-TGxB2g+1ur6MHkvM644DuZr8Uzyz0k0OYWtS3YlpfWBEmK4woaC2t3+pozEL3dBfIPmpgmClR5B2QRcMgGt22g==",
-      "dev": true,
-      "requires": {
-        "archiver-utils": "^2.1.0",
-        "compress-commons": "^4.0.0",
-=======
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-3.0.1.tgz",
-      "integrity": "sha512-r+JdDipt93ttDjsOVPU5zaq5bAyY+3H19bDrThkvuVxC0xMQzU1PJcS6D+KrP3u96gH9XLomcHPb+2skoDjulQ==",
-      "dev": true,
-      "requires": {
-        "archiver-utils": "^2.1.0",
-        "compress-commons": "^3.0.0",
->>>>>>> remove webpack from dependencies
-=======
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-4.0.2.tgz",
       "integrity": "sha512-TGxB2g+1ur6MHkvM644DuZr8Uzyz0k0OYWtS3YlpfWBEmK4woaC2t3+pozEL3dBfIPmpgmClR5B2QRcMgGt22g==",
@@ -51515,7 +47362,6 @@
       "requires": {
         "archiver-utils": "^2.1.0",
         "compress-commons": "^4.0.0",
->>>>>>> package-lock
         "readable-stream": "^3.6.0"
       },
       "dependencies": {