hot fiux

package-lock.json

@@ -11,14 +11,10 @@
         "@testing-library/jest-dom": "^5.11.4",
         "@testing-library/react": "^11.1.0",
         "@testing-library/user-event": "^12.1.10",
-<<<<<<< HEAD
         "bootstrap": "^5.1.1",
-        "react": "^17.0.2",
-        "react-bootstrap": "^2.0.0-rc.0",
-=======
         "ol": "^6.8.1",
         "react": "^17.0.2",
->>>>>>> c77bcb5be9d815db6e76418a774d28f46d0fd4e2
+        "react-bootstrap": "^2.0.0-rc.0",
         "react-dom": "^17.0.2",
         "react-router-dom": "^5.3.0",
         "react-scripts": "4.0.3",
@@ -2681,8 +2677,6 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-<<<<<<< HEAD
-=======
     "node_modules/@mapbox/jsonlint-lines-primitives": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/@mapbox/jsonlint-lines-primitives/-/jsonlint-lines-primitives-2.0.2.tgz",
@@ -2722,7 +2716,6 @@
       "resolved": "https://registry.npmjs.org/@mapbox/unitbezier/-/unitbezier-0.0.0.tgz",
       "integrity": "sha1-FWUb1VOme4WB+zmIEMmK2Go0Uk4="
     },
->>>>>>> c77bcb5be9d815db6e76418a774d28f46d0fd4e2
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -2801,8 +2794,6 @@
         "node": ">=10"
       }
     },
-<<<<<<< HEAD
-=======
     "node_modules/@petamoriken/float16": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@petamoriken/float16/-/float16-1.1.1.tgz",
@@ -2813,7 +2804,6 @@
         "lodash-es": ">=4.17.5 <5.0.0"
       }
     },
->>>>>>> c77bcb5be9d815db6e76418a774d28f46d0fd4e2
     "node_modules/@pmmmwh/react-refresh-webpack-plugin": {
       "version": "0.4.3",
       "resolved": "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.4.3.tgz",
@@ -2868,7 +2858,6 @@
         "node": ">= 8"
       }
     },
-<<<<<<< HEAD
     "node_modules/@popperjs/core": {
       "version": "2.10.2",
       "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.10.2.tgz",
@@ -2940,8 +2929,6 @@
         "react": ">=16.8.0"
       }
     },
-=======
->>>>>>> c77bcb5be9d815db6e76418a774d28f46d0fd4e2
     "node_modules/@rollup/plugin-node-resolve": {
       "version": "7.1.3",
       "resolved": "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-7.1.3.tgz",
@@ -3433,14 +3420,11 @@
       "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-5.1.2.tgz",
       "integrity": "sha512-h4lTMgMJctJybDp8CQrxTUiiYmedihHWkjnF/8Pxseu2S6Nlfcy8kwboQ8yejh456rP2yWoEVm1sS/FVsfM48w=="
     },
-<<<<<<< HEAD
     "node_modules/@types/invariant": {
       "version": "2.2.35",
       "resolved": "https://registry.npmjs.org/@types/invariant/-/invariant-2.2.35.tgz",
       "integrity": "sha512-DxX1V9P8zdJPYQat1gHyY0xj3efl8gnMVjiM9iCY6y27lj+PoQWkgjt8jDqmovPqULkKVpKRg8J36iQiA+EtEg=="
     },
-=======
->>>>>>> c77bcb5be9d815db6e76418a774d28f46d0fd4e2
     "node_modules/@types/istanbul-lib-coverage": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
@@ -3506,20 +3490,16 @@
       "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.4.1.tgz",
       "integrity": "sha512-Fo79ojj3vdEZOHg3wR9ksAMRz4P3S5fDB5e/YWZiFnyFQI1WY2Vftu9XoXVVtJfxB7Bpce/QTqWSSntkz2Znrw=="
     },
-<<<<<<< HEAD
     "node_modules/@types/prop-types": {
       "version": "15.7.4",
       "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.4.tgz",
       "integrity": "sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ=="
     },
-=======
->>>>>>> c77bcb5be9d815db6e76418a774d28f46d0fd4e2
     "node_modules/@types/q": {
       "version": "1.5.5",
       "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.5.tgz",
       "integrity": "sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ=="
     },
-<<<<<<< HEAD
     "node_modules/@types/react": {
       "version": "17.0.26",
       "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.26.tgz",
@@ -3538,8 +3518,6 @@
         "@types/react": "*"
       }
     },
-=======
->>>>>>> c77bcb5be9d815db6e76418a774d28f46d0fd4e2
     "node_modules/@types/resolve": {
       "version": "0.0.8",
       "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-0.0.8.tgz",
@@ -3548,14 +3526,11 @@
         "@types/node": "*"
       }
     },
-<<<<<<< HEAD
     "node_modules/@types/scheduler": {
       "version": "0.16.2",
       "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz",
       "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew=="
     },
-=======
->>>>>>> c77bcb5be9d815db6e76418a774d28f46d0fd4e2
     "node_modules/@types/source-list-map": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz",
@@ -3587,14 +3562,11 @@
         "source-map": "^0.6.1"
       }
     },
-<<<<<<< HEAD
     "node_modules/@types/warning": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/@types/warning/-/warning-3.0.0.tgz",
       "integrity": "sha1-DSUBJorY+ZYrdA04fEZU9fjiPlI="
     },
-=======
->>>>>>> c77bcb5be9d815db6e76418a774d28f46d0fd4e2
     "node_modules/@types/webpack": {
       "version": "4.41.31",
       "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.31.tgz",
@@ -5198,7 +5170,6 @@
       "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
       "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24="
     },
-<<<<<<< HEAD
     "node_modules/bootstrap": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.1.1.tgz",
@@ -5211,8 +5182,6 @@
         "@popperjs/core": "^2.10.1"
       }
     },
-=======
->>>>>>> c77bcb5be9d815db6e76418a774d28f46d0fd4e2
     "node_modules/brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -5698,14 +5667,11 @@
         "node": ">=0.10.0"
       }
     },
-<<<<<<< HEAD
     "node_modules/classnames": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.1.tgz",
       "integrity": "sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA=="
     },
-=======
->>>>>>> c77bcb5be9d815db6e76418a774d28f46d0fd4e2
     "node_modules/clean-css": {
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz",
@@ -6399,14 +6365,11 @@
       "resolved": "https://registry.npmjs.org/css.escape/-/css.escape-1.5.1.tgz",
       "integrity": "sha1-QuJ9T6BK4y+TGktNQZH6nN3ul8s="
     },
-<<<<<<< HEAD
-=======
     "node_modules/csscolorparser": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/csscolorparser/-/csscolorparser-1.0.3.tgz",
       "integrity": "sha1-s085HupNqPPpgjHizNjfnAQfFxs="
     },
->>>>>>> c77bcb5be9d815db6e76418a774d28f46d0fd4e2
     "node_modules/cssdb": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-4.4.0.tgz",
@@ -6607,14 +6570,11 @@
       "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
       "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg=="
     },
-<<<<<<< HEAD
     "node_modules/csstype": {
       "version": "3.0.9",
       "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.9.tgz",
       "integrity": "sha512-rpw6JPxK6Rfg1zLOYCSwle2GFOOsnjmDYDaBwEcwoOg4qlsIVCN789VkBZDJAGi4T07gI4YSutR43t9Zz4Lzuw=="
     },
-=======
->>>>>>> c77bcb5be9d815db6e76418a774d28f46d0fd4e2
     "node_modules/cyclist": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz",
@@ -6874,7 +6834,6 @@
         "node": ">= 0.6"
       }
     },
-<<<<<<< HEAD
     "node_modules/dequal": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.2.tgz",
@@ -6883,8 +6842,6 @@
         "node": ">=6"
       }
     },
-=======
->>>>>>> c77bcb5be9d815db6e76418a774d28f46d0fd4e2
     "node_modules/des.js": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
@@ -7021,7 +6978,6 @@
         "utila": "~0.4"
       }
     },
-<<<<<<< HEAD
     "node_modules/dom-helpers": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz",
@@ -7031,8 +6987,6 @@
         "csstype": "^3.0.2"
       }
     },
-=======
->>>>>>> c77bcb5be9d815db6e76418a774d28f46d0fd4e2
     "node_modules/dom-serializer": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
@@ -8296,8 +8250,6 @@
         "node": ">= 8"
       }
     },
-<<<<<<< HEAD
-=======
     "node_modules/esm": {
       "version": "3.2.25",
       "resolved": "https://registry.npmjs.org/esm/-/esm-3.2.25.tgz",
@@ -8307,7 +8259,6 @@
         "node": ">=6"
       }
     },
->>>>>>> c77bcb5be9d815db6e76418a774d28f46d0fd4e2
     "node_modules/espree": {
       "version": "7.3.1",
       "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
@@ -9312,8 +9263,6 @@
         "node": ">=6.9.0"
       }
     },
-<<<<<<< HEAD
-=======
     "node_modules/geotiff": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/geotiff/-/geotiff-1.0.6.tgz",
@@ -9337,7 +9286,6 @@
       "resolved": "https://registry.npmjs.org/pako/-/pako-2.0.4.tgz",
       "integrity": "sha512-v8tweI900AUkZN6heMU/4Uy4cXRc2AYNRggVmTR+dEncawDJgCdLMximOVA2p4qO57WMynangsfGRb5WD6L1Bg=="
     },
->>>>>>> c77bcb5be9d815db6e76418a774d28f46d0fd4e2
     "node_modules/get-caller-file": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
@@ -10341,7 +10289,6 @@
         "node": ">= 0.4"
       }
     },
-<<<<<<< HEAD
     "node_modules/invariant": {
       "version": "2.2.4",
       "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
@@ -10350,8 +10297,6 @@
         "loose-envify": "^1.0.0"
       }
     },
-=======
->>>>>>> c77bcb5be9d815db6e76418a774d28f46d0fd4e2
     "node_modules/ip": {
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
@@ -10679,8 +10624,6 @@
         "node": ">=8"
       }
     },
-<<<<<<< HEAD
-=======
     "node_modules/is-observable": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-observable/-/is-observable-2.1.0.tgz",
@@ -10692,7 +10635,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
->>>>>>> c77bcb5be9d815db6e76418a774d28f46d0fd4e2
     "node_modules/is-path-cwd": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
@@ -13101,14 +13043,11 @@
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
       "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE="
     },
-<<<<<<< HEAD
-=======
     "node_modules/json-stringify-pretty-compact": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/json-stringify-pretty-compact/-/json-stringify-pretty-compact-2.0.0.tgz",
       "integrity": "sha512-WRitRfs6BGq4q8gTgOy4ek7iPFXjbra0H3PmDLKm2xnZ+Gh1HUhiKGgCZkSPNULlP7mvfu6FV/mOLhCarspADQ=="
     },
->>>>>>> c77bcb5be9d815db6e76418a774d28f46d0fd4e2
     "node_modules/json3": {
       "version": "3.3.3",
       "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz",
@@ -13202,14 +13141,11 @@
         "webpack-sources": "^1.1.0"
       }
     },
-<<<<<<< HEAD
-=======
     "node_modules/lerc": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/lerc/-/lerc-3.0.0.tgz",
       "integrity": "sha512-Rm4J/WaHhRa93nCN2mwWDZFoRVF18G1f47C+kvQWyHGEZxFpTUi73p7lMVSAndyxGt6lJ2/CFbOcf9ra5p8aww=="
     },
->>>>>>> c77bcb5be9d815db6e76418a774d28f46d0fd4e2
     "node_modules/leven": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
@@ -13306,14 +13242,11 @@
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
-<<<<<<< HEAD
-=======
     "node_modules/lodash-es": {
       "version": "4.17.21",
       "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
       "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
     },
->>>>>>> c77bcb5be9d815db6e76418a774d28f46d0fd4e2
     "node_modules/lodash._reinterpolate": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
@@ -13476,14 +13409,11 @@
         "node": ">=0.10.0"
       }
     },
-<<<<<<< HEAD
-=======
     "node_modules/mapbox-to-css-font": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/mapbox-to-css-font/-/mapbox-to-css-font-2.4.0.tgz",
       "integrity": "sha512-v674D0WtpxCXlA6E+sBlG1QJWdUkz/s9qAD91bJSXBGuBL5lL4tJXpoJEftecphCh2SVQCjWMS2vhylc3AIQTg=="
     },
->>>>>>> c77bcb5be9d815db6e76418a774d28f46d0fd4e2
     "node_modules/md5.js": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
@@ -14317,21 +14247,16 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-<<<<<<< HEAD
-=======
     "node_modules/observable-fns": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/observable-fns/-/observable-fns-0.6.1.tgz",
       "integrity": "sha512-9gRK4+sRWzeN6AOewNBTLXir7Zl/i3GB6Yl26gK4flxz8BXVpD3kt8amREmWNb0mxYOGDotvE5a4N+PtGGKdkg=="
     },
->>>>>>> c77bcb5be9d815db6e76418a774d28f46d0fd4e2
     "node_modules/obuf": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
       "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg=="
     },
-<<<<<<< HEAD
-=======
     "node_modules/ol": {
       "version": "6.8.1",
       "resolved": "https://registry.npmjs.org/ol/-/ol-6.8.1.tgz",
@@ -14357,7 +14282,6 @@
         "webfont-matcher": "^1.1.0"
       }
     },
->>>>>>> c77bcb5be9d815db6e76418a774d28f46d0fd4e2
     "node_modules/on-finished": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
@@ -14603,14 +14527,11 @@
         "safe-buffer": "^5.1.1"
       }
     },
-<<<<<<< HEAD
-=======
     "node_modules/parse-headers": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/parse-headers/-/parse-headers-2.0.4.tgz",
       "integrity": "sha512-psZ9iZoCNFLrgRjZ1d8mn0h9WRqJwFxM9q3x7iUjN/YT2OksthDJ5TiPCu2F38kS4zutqfW+YdVVkBZZx3/1aw=="
     },
->>>>>>> c77bcb5be9d815db6e76418a774d28f46d0fd4e2
     "node_modules/parse-json": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
@@ -14720,8 +14641,6 @@
         "node": ">=8"
       }
     },
-<<<<<<< HEAD
-=======
     "node_modules/pbf": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/pbf/-/pbf-3.2.1.tgz",
@@ -14734,7 +14653,6 @@
         "pbf": "bin/pbf"
       }
     },
->>>>>>> c77bcb5be9d815db6e76418a774d28f46d0fd4e2
     "node_modules/pbkdf2": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
@@ -16267,7 +16185,6 @@
         "react-is": "^16.8.1"
       }
     },
-<<<<<<< HEAD
     "node_modules/prop-types-extra": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/prop-types-extra/-/prop-types-extra-1.1.1.tgz",
@@ -16285,21 +16202,16 @@
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
       "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
     },
-=======
->>>>>>> c77bcb5be9d815db6e76418a774d28f46d0fd4e2
     "node_modules/prop-types/node_modules/react-is": {
       "version": "16.13.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
       "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
     },
-<<<<<<< HEAD
-=======
     "node_modules/protocol-buffers-schema": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.6.0.tgz",
       "integrity": "sha512-TdDRD+/QNdrCGCE7v8340QyuXd4kIWIgapsE2+n/SaGiSSbomYl4TjHlvIoCWRpE7wFt02EpB35VVA2ImcBVqw=="
     },
->>>>>>> c77bcb5be9d815db6e76418a774d28f46d0fd4e2
     "node_modules/proxy-addr": {
       "version": "2.0.7",
       "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
@@ -16446,14 +16358,11 @@
         }
       ]
     },
-<<<<<<< HEAD
-=======
     "node_modules/quickselect": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/quickselect/-/quickselect-2.0.0.tgz",
       "integrity": "sha512-RKJ22hX8mHe3Y6wH/N3wCM6BWtjaxIyyUIkpHOvfFnxdI4yD4tBXEBKSbriGujF6jnSVkJrffuo6vxACiSSxIw=="
     },
->>>>>>> c77bcb5be9d815db6e76418a774d28f46d0fd4e2
     "node_modules/raf": {
       "version": "3.4.1",
       "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
@@ -16509,8 +16418,6 @@
         "node": ">= 0.8"
       }
     },
-<<<<<<< HEAD
-=======
     "node_modules/rbush": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/rbush/-/rbush-3.0.1.tgz",
@@ -16519,7 +16426,6 @@
         "quickselect": "^2.0.0"
       }
     },
->>>>>>> c77bcb5be9d815db6e76418a774d28f46d0fd4e2
     "node_modules/react": {
       "version": "17.0.2",
       "resolved": "https://registry.npmjs.org/react/-/react-17.0.2.tgz",
@@ -16548,7 +16454,6 @@
         "node": ">=10"
       }
     },
-<<<<<<< HEAD
     "node_modules/react-bootstrap": {
       "version": "2.0.0-rc.0",
       "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-2.0.0-rc.0.tgz",
@@ -16577,8 +16482,6 @@
         "react-dom": ">=16.14.0"
       }
     },
-=======
->>>>>>> c77bcb5be9d815db6e76418a774d28f46d0fd4e2
     "node_modules/react-dev-utils": {
       "version": "11.0.4",
       "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-11.0.4.tgz",
@@ -16874,14 +16777,11 @@
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
       "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
     },
-<<<<<<< HEAD
     "node_modules/react-lifecycles-compat": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
       "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
     },
-=======
->>>>>>> c77bcb5be9d815db6e76418a774d28f46d0fd4e2
     "node_modules/react-refresh": {
       "version": "0.8.3",
       "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.8.3.tgz",
@@ -17028,7 +16928,6 @@
         }
       }
     },
-<<<<<<< HEAD
     "node_modules/react-transition-group": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.2.tgz",
@@ -17044,8 +16943,6 @@
         "react-dom": ">=16.6.0"
       }
     },
-=======
->>>>>>> c77bcb5be9d815db6e76418a774d28f46d0fd4e2
     "node_modules/read-pkg": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
@@ -17515,8 +17412,6 @@
       "resolved": "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-3.0.0.tgz",
       "integrity": "sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng=="
     },
-<<<<<<< HEAD
-=======
     "node_modules/resolve-protobuf-schema": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/resolve-protobuf-schema/-/resolve-protobuf-schema-2.1.0.tgz",
@@ -17525,7 +17420,6 @@
         "protocol-buffers-schema": "^3.3.1"
       }
     },
->>>>>>> c77bcb5be9d815db6e76418a774d28f46d0fd4e2
     "node_modules/resolve-url": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
@@ -17916,14 +17810,11 @@
         "aproba": "^1.1.1"
       }
     },
-<<<<<<< HEAD
-=======
     "node_modules/rw": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz",
       "integrity": "sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q="
     },
->>>>>>> c77bcb5be9d815db6e76418a774d28f46d0fd4e2
     "node_modules/safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
@@ -18689,8 +18580,6 @@
         "uuid": "bin/uuid"
       }
     },
-<<<<<<< HEAD
-=======
     "node_modules/sort-asc": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/sort-asc/-/sort-asc-0.1.0.tgz",
@@ -18707,7 +18596,6 @@
         "node": ">=0.10.0"
       }
     },
->>>>>>> c77bcb5be9d815db6e76418a774d28f46d0fd4e2
     "node_modules/sort-keys": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
@@ -18719,8 +18607,6 @@
         "node": ">=0.10.0"
       }
     },
-<<<<<<< HEAD
-=======
     "node_modules/sort-object": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/sort-object/-/sort-object-0.3.2.tgz",
@@ -18733,7 +18619,6 @@
         "node": ">=0.10.0"
       }
     },
->>>>>>> c77bcb5be9d815db6e76418a774d28f46d0fd4e2
     "node_modules/source-list-map": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
@@ -19601,8 +19486,6 @@
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
       "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ="
     },
-<<<<<<< HEAD
-=======
     "node_modules/threads": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/threads/-/threads-1.7.0.tgz",
@@ -19620,7 +19503,6 @@
         "tiny-worker": ">= 2"
       }
     },
->>>>>>> c77bcb5be9d815db6e76418a774d28f46d0fd4e2
     "node_modules/throat": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/throat/-/throat-5.0.0.tgz",
@@ -19666,8 +19548,6 @@
       "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz",
       "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA=="
     },
-<<<<<<< HEAD
-=======
     "node_modules/tiny-worker": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/tiny-worker/-/tiny-worker-2.3.0.tgz",
@@ -19677,7 +19557,6 @@
         "esm": "^3.2.25"
       }
     },
->>>>>>> c77bcb5be9d815db6e76418a774d28f46d0fd4e2
     "node_modules/tmpl": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
@@ -19847,8 +19726,6 @@
       "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
       "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY="
     },
-<<<<<<< HEAD
-=======
     "node_modules/txml": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/txml/-/txml-5.0.1.tgz",
@@ -19866,7 +19743,6 @@
         "readable-stream": "2 || 3"
       }
     },
->>>>>>> c77bcb5be9d815db6e76418a774d28f46d0fd4e2
     "node_modules/type": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
@@ -19941,7 +19817,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-<<<<<<< HEAD
     "node_modules/uncontrollable": {
       "version": "7.2.1",
       "resolved": "https://registry.npmjs.org/uncontrollable/-/uncontrollable-7.2.1.tgz",
@@ -19956,8 +19831,6 @@
         "react": ">=15.0.0"
       }
     },
-=======
->>>>>>> c77bcb5be9d815db6e76418a774d28f46d0fd4e2
     "node_modules/unicode-canonical-property-names-ecmascript": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
@@ -20359,7 +20232,6 @@
         "makeerror": "1.0.x"
       }
     },
-<<<<<<< HEAD
     "node_modules/warning": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
@@ -20368,8 +20240,6 @@
         "loose-envify": "^1.0.0"
       }
     },
-=======
->>>>>>> c77bcb5be9d815db6e76418a774d28f46d0fd4e2
     "node_modules/watchpack": {
       "version": "1.7.5",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz",
@@ -20646,14 +20516,11 @@
       "resolved": "https://registry.npmjs.org/web-vitals/-/web-vitals-1.1.2.tgz",
       "integrity": "sha512-PFMKIY+bRSXlMxVAQ+m2aw9c/ioUYfDgrYot0YUa+/xa0sakubWhSDyxAKwzymvXVdF4CZI71g06W+mqhzu6ig=="
     },
-<<<<<<< HEAD
-=======
     "node_modules/webfont-matcher": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/webfont-matcher/-/webfont-matcher-1.1.0.tgz",
       "integrity": "sha1-mM6VCXsp4x++czBT4Q5XFkLRxsc="
     },
->>>>>>> c77bcb5be9d815db6e76418a774d28f46d0fd4e2
     "node_modules/webidl-conversions": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
@@ -34582,7 +34449,6 @@
         }
       }
     },
-<<<<<<< HEAD
     "prop-types-extra": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/prop-types-extra/-/prop-types-extra-1.1.1.tgz",
@@ -34598,12 +34464,11 @@
           "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
         }
       }
-=======
+    },
     "protocol-buffers-schema": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.6.0.tgz",
       "integrity": "sha512-TdDRD+/QNdrCGCE7v8340QyuXd4kIWIgapsE2+n/SaGiSSbomYl4TjHlvIoCWRpE7wFt02EpB35VVA2ImcBVqw=="
->>>>>>> c77bcb5be9d815db6e76418a774d28f46d0fd4e2
     },
     "proxy-addr": {
       "version": "2.0.7",

package.json

@@ -6,11 +6,8 @@
     "@testing-library/jest-dom": "^5.11.4",
     "@testing-library/react": "^11.1.0",
     "@testing-library/user-event": "^12.1.10",
-<<<<<<< HEAD
     "bootstrap": "^5.1.1",
-=======
     "ol": "^6.8.1",
->>>>>>> c77bcb5be9d815db6e76418a774d28f46d0fd4e2
     "react": "^17.0.2",
     "react-bootstrap": "^2.0.0-rc.0",
     "react-dom": "^17.0.2",