diff --git a/frontend/dashboard/package-lock.json b/frontend/dashboard/package-lock.json
index 889762a8..b5dbaf0e 100644
--- a/frontend/dashboard/package-lock.json
+++ b/frontend/dashboard/package-lock.json
@@ -202,19 +202,11 @@
       }
     },
     "node_modules/@babel/generator": {
-<<<<<<< HEAD
       "version": "7.23.0",
       "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.0.tgz",
       "integrity": "sha512-lN85QRR+5IbYrMWM6Y4pE/noaQtg4pNiqeNGX60eqOfo6gtEj6uw/JagelB8vVztSd7R6M5n1+PQkDbHbBRU4g==",
       "dependencies": {
         "@babel/types": "^7.23.0",
-=======
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.10.tgz",
-      "integrity": "sha512-79KIf7YiWjjdZ81JnLujDRApWtl7BxTqWD88+FFdQEIOG8LJ0etDOM7CXuIgGJa55sGOwZVwuEsaLEm0PJ5/+A==",
-      "dependencies": {
-        "@babel/types": "^7.22.10",
->>>>>>> 03afed696e270d782cc5a3e8f600f823bd2fa562
         "@jridgewell/gen-mapping": "^0.3.2",
         "@jridgewell/trace-mapping": "^0.3.17",
         "jsesc": "^2.5.1"
@@ -248,15 +240,9 @@
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-<<<<<<< HEAD
       "version": "7.22.15",
       "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz",
       "integrity": "sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==",
-=======
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.10.tgz",
-      "integrity": "sha512-JMSwHD4J7SLod0idLq5PKgI+6g/hLD/iuWBq08ZX49xE14VpVEojJ5rHWptpirV2j020MvypRLAXAO50igCJ5Q==",
->>>>>>> 03afed696e270d782cc5a3e8f600f823bd2fa562
       "dependencies": {
         "@babel/compat-data": "^7.22.9",
         "@babel/helper-validator-option": "^7.22.15",
@@ -545,7 +531,6 @@
       }
     },
     "node_modules/@babel/helpers": {
-<<<<<<< HEAD
       "version": "7.23.1",
       "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.1.tgz",
       "integrity": "sha512-chNpneuK18yW5Oxsr+t553UZzzAs3aZnFm4bxhebsNTeshrC95yA7l5yl7GBAG+JG1rF0F7zzD2EixK9mWSDoA==",
@@ -553,30 +538,15 @@
         "@babel/template": "^7.22.15",
         "@babel/traverse": "^7.23.0",
         "@babel/types": "^7.23.0"
-=======
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.11.tgz",
-      "integrity": "sha512-vyOXC8PBWaGc5h7GMsNx68OH33cypkEDJCHvYVVgVbbxJDROYVtexSk0gK5iCF1xNjRIN2s8ai7hwkWDq5szWg==",
-      "dependencies": {
-        "@babel/template": "^7.22.5",
-        "@babel/traverse": "^7.22.11",
-        "@babel/types": "^7.22.11"
->>>>>>> 03afed696e270d782cc5a3e8f600f823bd2fa562
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/highlight": {
-<<<<<<< HEAD
       "version": "7.22.20",
       "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz",
       "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==",
-=======
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.10.tgz",
-      "integrity": "sha512-78aUtVcT7MUscr0K5mIEnkwxPE0MaxkR5RxRwuHaQ+JuU5AmTPhY+do2mdzVTnIJJpyBglql2pehuBIWHug+WQ==",
->>>>>>> 03afed696e270d782cc5a3e8f600f823bd2fa562
       "dependencies": {
         "@babel/helper-validator-identifier": "^7.22.20",
         "chalk": "^2.4.2",
@@ -587,15 +557,9 @@
       }
     },
     "node_modules/@babel/parser": {
-<<<<<<< HEAD
       "version": "7.23.0",
       "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.0.tgz",
       "integrity": "sha512-vvPKKdMemU85V9WE/l5wZEmImpCtLqbnTvqDS2U1fJ96KrxoW7KrXhNsNCblQlg8Ck4b85yxdTyelsMUgFUXiw==",
-=======
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.11.tgz",
-      "integrity": "sha512-R5zb8eJIBPJriQtbH/htEQy4k7E2dHWlD2Y2VT07JCzwYZHBxV5ZYtM0UhXSNMT74LyxuM+b1jdL7pSesXbC/g==",
->>>>>>> 03afed696e270d782cc5a3e8f600f823bd2fa562
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -1930,15 +1894,9 @@
       }
     },
     "node_modules/@babel/runtime": {
-<<<<<<< HEAD
       "version": "7.23.1",
       "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.1.tgz",
       "integrity": "sha512-hC2v6p8ZSI/W0HUzh3V8C5g+NwSKzKPtJwSpTjwl0o297GP9+ZLQSkdvHz46CM3LqyoXxq+5G9komY+eSqSO0g==",
-=======
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.11.tgz",
-      "integrity": "sha512-ee7jVNlWN09+KftVOu9n7S8gQzD/Z6hN/I8VBRXW4P1+Xe7kJGXMwu8vds4aGIMHZnNbdpSWCfZZtinytpcAvA==",
->>>>>>> 03afed696e270d782cc5a3e8f600f823bd2fa562
       "dependencies": {
         "regenerator-runtime": "^0.14.0"
       },
@@ -1978,7 +1936,6 @@
       }
     },
     "node_modules/@babel/traverse": {
-<<<<<<< HEAD
       "version": "7.23.0",
       "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.0.tgz",
       "integrity": "sha512-t/QaEvyIoIkwzpiZ7aoSKK8kObQYeF7T2v+dazAYCb8SXtp58zEVkWW7zAnju8FNKNdr4ScAOEDmMItbyOmEYw==",
@@ -1991,20 +1948,6 @@
         "@babel/helper-split-export-declaration": "^7.22.6",
         "@babel/parser": "^7.23.0",
         "@babel/types": "^7.23.0",
-=======
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.11.tgz",
-      "integrity": "sha512-mzAenteTfomcB7mfPtyi+4oe5BZ6MXxWcn4CX+h4IRJ+OOGXBrWU6jDQavkQI9Vuc5P+donFabBfFCcmWka9lQ==",
-      "dependencies": {
-        "@babel/code-frame": "^7.22.10",
-        "@babel/generator": "^7.22.10",
-        "@babel/helper-environment-visitor": "^7.22.5",
-        "@babel/helper-function-name": "^7.22.5",
-        "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.22.11",
-        "@babel/types": "^7.22.11",
->>>>>>> 03afed696e270d782cc5a3e8f600f823bd2fa562
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       },
@@ -2013,15 +1956,9 @@
       }
     },
     "node_modules/@babel/types": {
-<<<<<<< HEAD
       "version": "7.23.0",
       "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz",
       "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==",
-=======
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.11.tgz",
-      "integrity": "sha512-siazHiGuZRz9aB9NpHy9GOs9xiQPKnMzgdr493iI1M67vRXpnEq8ZOOKzezC5q7zwuQ6sDhdSp4SD9ixKSqKZg==",
->>>>>>> 03afed696e270d782cc5a3e8f600f823bd2fa562
       "dependencies": {
         "@babel/helper-string-parser": "^7.22.5",
         "@babel/helper-validator-identifier": "^7.22.20",
@@ -2279,15 +2216,9 @@
       }
     },
     "node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": {
-<<<<<<< HEAD
       "version": "3.4.1",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
       "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==",
-=======
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
->>>>>>> 03afed696e270d782cc5a3e8f600f823bd2fa562
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -2297,15 +2228,9 @@
       }
     },
     "node_modules/@eslint-community/regexpp": {
-<<<<<<< HEAD
       "version": "4.8.2",
       "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.8.2.tgz",
       "integrity": "sha512-0MGxAVt1m/ZK+LTJp/j0qF7Hz97D9O/FH9Ms3ltnyIdDD57cbb1ACIQTkbHvNXtWDv5TPq7w5Kq56+cNukbo7g==",
-=======
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.8.0.tgz",
-      "integrity": "sha512-JylOEEzDiOryeUnFbQz+oViCXS0KsvR1mvHkoMiu5+UiBvy+RYX7tzlIIIEstF/gVa2tj9AQXk3dgnxv6KxhFg==",
->>>>>>> 03afed696e270d782cc5a3e8f600f823bd2fa562
       "dev": true,
       "engines": {
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
@@ -2351,15 +2276,9 @@
       }
     },
     "node_modules/@eslint/eslintrc/node_modules/globals": {
-<<<<<<< HEAD
       "version": "13.22.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-13.22.0.tgz",
       "integrity": "sha512-H1Ddc/PbZHTDVJSnj8kWptIRSD6AM3pK+mKytuIVF4uoBV7rshFlhhvA58ceJ5wp3Er58w6zj7bykMpYXt3ETw==",
-=======
-      "version": "13.21.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.21.0.tgz",
-      "integrity": "sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==",
->>>>>>> 03afed696e270d782cc5a3e8f600f823bd2fa562
       "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
@@ -2378,15 +2297,9 @@
       "dev": true
     },
     "node_modules/@eslint/js": {
-<<<<<<< HEAD
       "version": "8.50.0",
       "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.50.0.tgz",
       "integrity": "sha512-NCC3zz2+nvYd+Ckfh87rA47zfu2QsQpvc6k1yzTk+b9KzRj0wkGa8LSoGOXN6Zv4lRf/EIoZ80biDh9HOI+RNQ==",
-=======
-      "version": "8.48.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.48.0.tgz",
-      "integrity": "sha512-ZSjtmelB7IJfWD2Fvb7+Z+ChTIKWq6kjda95fLcQKNS5aheVHn4IkfgRQE3sIIzTcSLwLcLZUD9UBt+V7+h+Pw==",
->>>>>>> 03afed696e270d782cc5a3e8f600f823bd2fa562
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -2617,34 +2530,20 @@
       }
     },
     "node_modules/@mui/core-downloads-tracker": {
-<<<<<<< HEAD
       "version": "5.14.10",
       "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.14.10.tgz",
       "integrity": "sha512-kPHu/NhZq1k+vSZR5wq3AyUfD4bnfWAeuKpps0+8PS7ZHQ2Lyv1cXJh+PlFdCIOa0PK98rk3JPwMzS8BMhdHwQ==",
-=======
-      "version": "5.14.6",
-      "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.14.6.tgz",
-      "integrity": "sha512-QZEU3pyGWLuaHbxvOlShol7U1FVgzWBR0OH9H8D7L8w4/vto5N5jJVvlqFQS3T0zbR6YGHxFaiL6Ky87jQg7aw==",
->>>>>>> 03afed696e270d782cc5a3e8f600f823bd2fa562
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/mui"
       }
     },
     "node_modules/@mui/icons-material": {
-<<<<<<< HEAD
       "version": "5.14.9",
       "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.14.9.tgz",
       "integrity": "sha512-xTRQbDsogsJo7tY5Og8R9zbuG2q+KIPVIM6JQoKxtJlz9DPOw1u0T2fGrvwD+XAOVifQf6epNMcGCDLfJAz4Nw==",
       "dependencies": {
         "@babel/runtime": "^7.22.15"
-=======
-      "version": "5.14.6",
-      "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.14.6.tgz",
-      "integrity": "sha512-7Cujy7lRGTj2T3SvY9C9ZOTFDtrXJogeNnRcU/ODyNoxwskMNPFOcc15F+98MAdJenBVLJPYu+vPP6DUvEpNrA==",
-      "dependencies": {
-        "@babel/runtime": "^7.22.10"
->>>>>>> 03afed696e270d782cc5a3e8f600f823bd2fa562
       },
       "engines": {
         "node": ">=12.0.0"
@@ -2762,15 +2661,9 @@
       }
     },
     "node_modules/@mui/material": {
-<<<<<<< HEAD
       "version": "5.14.10",
       "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.14.10.tgz",
       "integrity": "sha512-ejFMppnO+lzBXpzju+N4SSz0Mhmi5sihXUGcr5FxpgB6bfUP0Lpe32O0Sw/3s8xlmLEvG1fqVT0rRyAVMlCA+A==",
-=======
-      "version": "5.14.6",
-      "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.14.6.tgz",
-      "integrity": "sha512-C3UgGrmtvcGkQkm0ONBU7bTdapTjQc2Se3b2354xMmU7lgSgW7VM6EP9wIH5XqqoJ60m9l/s9kbTWX0Y+EaWvA==",
->>>>>>> 03afed696e270d782cc5a3e8f600f823bd2fa562
       "dependencies": {
         "@babel/runtime": "^7.22.15",
         "@mui/base": "5.0.0-beta.16",
@@ -2812,15 +2705,9 @@
       }
     },
     "node_modules/@mui/material/node_modules/@mui/base": {
-<<<<<<< HEAD
       "version": "5.0.0-beta.16",
       "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-beta.16.tgz",
       "integrity": "sha512-OYxhC81c9bO0wobGcM8rrY5bRwpCXAI21BL0P2wz/2vTv4ek7ALz9+U5M8wgdmtRNUhmCmAB4L2WRwFRf5Cd8Q==",
-=======
-      "version": "5.0.0-beta.12",
-      "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-beta.12.tgz",
-      "integrity": "sha512-tZjjXNAyUpwSDT1uRliZMhRQkWYzELJ8Qi61EuOMRpi36HIwnK2T7Nr4RI423Sv8G2EEikDAZj7je33eNd73NQ==",
->>>>>>> 03afed696e270d782cc5a3e8f600f823bd2fa562
       "dependencies": {
         "@babel/runtime": "^7.22.15",
         "@floating-ui/react-dom": "^2.0.2",
@@ -2828,12 +2715,7 @@
         "@mui/utils": "^5.14.10",
         "@popperjs/core": "^2.11.8",
         "clsx": "^2.0.0",
-<<<<<<< HEAD
         "prop-types": "^15.8.1"
-=======
-        "prop-types": "^15.8.1",
-        "react-is": "^18.2.0"
->>>>>>> 03afed696e270d782cc5a3e8f600f823bd2fa562
       },
       "engines": {
         "node": ">=12.0.0"
@@ -2867,21 +2749,12 @@
       "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
     },
     "node_modules/@mui/private-theming": {
-<<<<<<< HEAD
       "version": "5.14.10",
       "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.14.10.tgz",
       "integrity": "sha512-f67xOj3H06wWDT9xBg7hVL/HSKNF+HG1Kx0Pm23skkbEqD2Ef2Lif64e5nPdmWVv+7cISCYtSuE2aeuzrZe78w==",
       "dependencies": {
         "@babel/runtime": "^7.22.15",
         "@mui/utils": "^5.14.10",
-=======
-      "version": "5.14.6",
-      "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-5.14.6.tgz",
-      "integrity": "sha512-3VBLFGizBXfofyk33bwRg6t9L648aKnLmOKPfY1wFuiXq3AEYwobK65iDci/tHKxm/VKbZ6A7PFjLejvB3EvRQ==",
-      "dependencies": {
-        "@babel/runtime": "^7.22.10",
-        "@mui/utils": "^5.14.6",
->>>>>>> 03afed696e270d782cc5a3e8f600f823bd2fa562
         "prop-types": "^15.8.1"
       },
       "engines": {
@@ -2902,19 +2775,11 @@
       }
     },
     "node_modules/@mui/styled-engine": {
-<<<<<<< HEAD
       "version": "5.14.10",
       "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.14.10.tgz",
       "integrity": "sha512-EJckxmQHrsBvDbFu1trJkvjNw/1R7jfNarnqPSnL+jEQawCkQIqVELWLrlOa611TFtxSJGkdUfCFXeJC203HVg==",
       "dependencies": {
         "@babel/runtime": "^7.22.15",
-=======
-      "version": "5.14.6",
-      "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-5.14.6.tgz",
-      "integrity": "sha512-I6zeu/OP1Hk4NsX1Oj85TiYl1dER0JMsLJVn76J1Ihl24A5EbiZQKJp3Mn+ufA79ypkdAvM9aQCAQyiVBFcUHg==",
-      "dependencies": {
-        "@babel/runtime": "^7.22.10",
->>>>>>> 03afed696e270d782cc5a3e8f600f823bd2fa562
         "@emotion/cache": "^11.11.0",
         "csstype": "^3.1.2",
         "prop-types": "^15.8.1"
@@ -2941,15 +2806,9 @@
       }
     },
     "node_modules/@mui/system": {
-<<<<<<< HEAD
       "version": "5.14.10",
       "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.14.10.tgz",
       "integrity": "sha512-QQmtTG/R4gjmLiL5ECQ7kRxLKDm8aKKD7seGZfbINtRVJDyFhKChA1a+K2bfqIAaBo1EMDv+6FWNT1Q5cRKjFA==",
-=======
-      "version": "5.14.6",
-      "resolved": "https://registry.npmjs.org/@mui/system/-/system-5.14.6.tgz",
-      "integrity": "sha512-/n0ae1MegWjiV1BpRU8jgg4E0zBjeB2VYsT/68ag/xaDuq3/TaDKJeT9REIvyBvwlG3CI3S2O+tRELktxCD1kg==",
->>>>>>> 03afed696e270d782cc5a3e8f600f823bd2fa562
       "dependencies": {
         "@babel/runtime": "^7.22.15",
         "@mui/private-theming": "^5.14.10",
@@ -3007,19 +2866,11 @@
       }
     },
     "node_modules/@mui/utils": {
-<<<<<<< HEAD
       "version": "5.14.10",
       "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.14.10.tgz",
       "integrity": "sha512-Rn+vYQX7FxkcW0riDX/clNUwKuOJFH45HiULxwmpgnzQoQr3A0lb+QYwaZ+FAkZrR7qLoHKmLQlcItu6LT0y/Q==",
       "dependencies": {
         "@babel/runtime": "^7.22.15",
-=======
-      "version": "5.14.6",
-      "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-5.14.6.tgz",
-      "integrity": "sha512-AznpqLu6hrFnpHgcvsSSMCG+cDbkcCYfo+daUwBVReNYv4l+NQ8+wvBAF4aUMi155N7xWbbgh0cyKs6Wdsm3aA==",
-      "dependencies": {
-        "@babel/runtime": "^7.22.10",
->>>>>>> 03afed696e270d782cc5a3e8f600f823bd2fa562
         "@types/prop-types": "^15.7.5",
         "prop-types": "^15.8.1",
         "react-is": "^18.2.0"
@@ -3205,15 +3056,9 @@
       }
     },
     "node_modules/@remix-run/router": {
-<<<<<<< HEAD
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.9.0.tgz",
       "integrity": "sha512-bV63itrKBC0zdT27qYm6SDZHlkXwFL1xMBuhkn+X7l0+IIhNaH5wuuvZKp6eKhCD4KFhujhfhCT1YxXW6esUIA==",
-=======
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.8.0.tgz",
-      "integrity": "sha512-mrfKqIHnSZRyIzBcanNJmVQELTnX+qagEDlcKO90RgRBVOZGSGvZKeDihTRfWcqoDn5N/NkUcwWTccnpN18Tfg==",
->>>>>>> 03afed696e270d782cc5a3e8f600f823bd2fa562
       "engines": {
         "node": ">=14.0.0"
       }
@@ -3410,15 +3255,9 @@
       "dev": true
     },
     "node_modules/@types/lodash": {
-<<<<<<< HEAD
       "version": "4.14.199",
       "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.199.tgz",
       "integrity": "sha512-Vrjz5N5Ia4SEzWWgIVwnHNEnb1UE1XMkvY5DGXrAeOGE9imk0hgTHh5GyDjLDJi9OTCn9oo9dXH1uToK1VRfrg=="
-=======
-      "version": "4.14.197",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.197.tgz",
-      "integrity": "sha512-BMVOiWs0uNxHVlHBgzTIqJYmj+PgCo4euloGF+5m4okL3rEYzM2EEv78mw8zWSMM57dM7kVIgJ2QDvwHSoCI5g=="
->>>>>>> 03afed696e270d782cc5a3e8f600f823bd2fa562
     },
     "node_modules/@types/node": {
       "version": "17.0.21",
@@ -3659,15 +3498,9 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/eslint-visitor-keys": {
-<<<<<<< HEAD
       "version": "3.4.1",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
       "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==",
-=======
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
->>>>>>> 03afed696e270d782cc5a3e8f600f823bd2fa562
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -3812,15 +3645,9 @@
       }
     },
     "node_modules/@typescript-eslint/parser/node_modules/eslint-visitor-keys": {
-<<<<<<< HEAD
       "version": "3.4.1",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
       "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==",
-=======
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
->>>>>>> 03afed696e270d782cc5a3e8f600f823bd2fa562
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -3989,15 +3816,9 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils/node_modules/eslint-visitor-keys": {
-<<<<<<< HEAD
       "version": "3.4.1",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
       "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==",
-=======
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
->>>>>>> 03afed696e270d782cc5a3e8f600f823bd2fa562
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -4306,7 +4127,6 @@
       }
     },
     "node_modules/array.prototype.findlastindex": {
-<<<<<<< HEAD
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz",
       "integrity": "sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA==",
@@ -4315,16 +4135,6 @@
         "call-bind": "^1.0.2",
         "define-properties": "^1.2.0",
         "es-abstract": "^1.22.1",
-=======
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.2.tgz",
-      "integrity": "sha512-tb5thFFlUcp7NdNF6/MpDk/1r/4awWG1FIz3YqDf+/zJSTezBb+/5WViH41obXULHVpDzoiCLpJ/ZO9YbJMsdw==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
->>>>>>> 03afed696e270d782cc5a3e8f600f823bd2fa562
         "es-shim-unscopables": "^1.0.0",
         "get-intrinsic": "^1.2.1"
       },
@@ -4627,15 +4437,9 @@
       }
     },
     "node_modules/browserslist": {
-<<<<<<< HEAD
       "version": "4.21.9",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.9.tgz",
       "integrity": "sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg==",
-=======
-      "version": "4.21.10",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz",
-      "integrity": "sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==",
->>>>>>> 03afed696e270d782cc5a3e8f600f823bd2fa562
       "funding": [
         {
           "type": "opencollective",
@@ -4651,15 +4455,9 @@
         }
       ],
       "dependencies": {
-<<<<<<< HEAD
         "caniuse-lite": "^1.0.30001503",
         "electron-to-chromium": "^1.4.431",
         "node-releases": "^2.0.12",
-=======
-        "caniuse-lite": "^1.0.30001517",
-        "electron-to-chromium": "^1.4.477",
-        "node-releases": "^2.0.13",
->>>>>>> 03afed696e270d782cc5a3e8f600f823bd2fa562
         "update-browserslist-db": "^1.0.11"
       },
       "bin": {
@@ -4733,15 +4531,9 @@
       "integrity": "sha1-IsxKNKCrxDlQ9CxkEQJKP2NmtFo="
     },
     "node_modules/caniuse-lite": {
-<<<<<<< HEAD
       "version": "1.0.30001517",
       "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001517.tgz",
       "integrity": "sha512-Vdhm5S11DaFVLlyiKu4hiUTkpZu+y1KA/rZZqVQfOD5YdDT/eQKlkt7NaE0WGOFgX32diqt9MiP9CAiFeRklaA==",
-=======
-      "version": "1.0.30001524",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001524.tgz",
-      "integrity": "sha512-Jj917pJtYg9HSJBF95HVX3Cdr89JUyLT4IZ8SvM5aDRni95swKgYi3TgYLH5hnGfPE/U1dg6IfZ50UsIlLkwSA==",
->>>>>>> 03afed696e270d782cc5a3e8f600f823bd2fa562
       "funding": [
         {
           "type": "opencollective",
@@ -5135,15 +4927,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-<<<<<<< HEAD
       "version": "1.4.467",
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.467.tgz",
       "integrity": "sha512-2qI70O+rR4poYeF2grcuS/bCps5KJh6y1jtZMDDEteyKJQrzLOEhFyXCLcHW6DTBjKjWkk26JhWoAi+Ux9A0fg=="
-=======
-      "version": "1.4.503",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.503.tgz",
-      "integrity": "sha512-LF2IQit4B0VrUHFeQkWhZm97KuJSGF2WJqq1InpY+ECpFRkXd8yTIaTtJxsO0OKDmiBYwWqcrNaXOurn2T2wiA=="
->>>>>>> 03afed696e270d782cc5a3e8f600f823bd2fa562
     },
     "node_modules/emoji-regex": {
       "version": "9.2.2",
@@ -5345,27 +5131,16 @@
       }
     },
     "node_modules/eslint": {
-<<<<<<< HEAD
       "version": "8.50.0",
       "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.50.0.tgz",
       "integrity": "sha512-FOnOGSuFuFLv/Sa+FDVRZl4GGVAAFFi8LecRsI5a1tMO5HIE8nCm4ivAlzt4dT3ol/PaaGC0rJEEXQmHJBGoOg==",
-=======
-      "version": "8.48.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.48.0.tgz",
-      "integrity": "sha512-sb6DLeIuRXxeM1YljSe1KEx9/YYeZFQWcV8Rq9HfigmdDEugjLEVEa1ozDjL6YDjBpQHPJxJzze+alxi4T3OLg==",
->>>>>>> 03afed696e270d782cc5a3e8f600f823bd2fa562
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
         "@eslint/eslintrc": "^2.1.2",
-<<<<<<< HEAD
         "@eslint/js": "8.50.0",
         "@humanwhocodes/config-array": "^0.11.11",
-=======
-        "@eslint/js": "8.48.0",
-        "@humanwhocodes/config-array": "^0.11.10",
->>>>>>> 03afed696e270d782cc5a3e8f600f823bd2fa562
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
         "ajv": "^6.12.4",
@@ -5505,7 +5280,6 @@
       }
     },
     "node_modules/eslint-import-resolver-node": {
-<<<<<<< HEAD
       "version": "0.3.7",
       "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz",
       "integrity": "sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==",
@@ -5514,16 +5288,6 @@
         "debug": "^3.2.7",
         "is-core-module": "^2.11.0",
         "resolve": "^1.22.1"
-=======
-      "version": "0.3.9",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",
-      "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==",
-      "dev": true,
-      "dependencies": {
-        "debug": "^3.2.7",
-        "is-core-module": "^2.13.0",
-        "resolve": "^1.22.4"
->>>>>>> 03afed696e270d782cc5a3e8f600f823bd2fa562
       }
     },
     "node_modules/eslint-import-resolver-node/node_modules/debug": {
@@ -5651,18 +5415,6 @@
         "node": ">=0.10.0"
       }
     },
-<<<<<<< HEAD
-=======
-    "node_modules/eslint-plugin-import/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
->>>>>>> 03afed696e270d782cc5a3e8f600f823bd2fa562
     "node_modules/eslint-plugin-jest": {
       "version": "25.7.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-25.7.0.tgz",
@@ -5980,15 +5732,9 @@
       }
     },
     "node_modules/eslint/node_modules/globals": {
-<<<<<<< HEAD
       "version": "13.20.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",
       "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
-=======
-      "version": "13.21.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.21.0.tgz",
-      "integrity": "sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==",
->>>>>>> 03afed696e270d782cc5a3e8f600f823bd2fa562
       "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
@@ -8050,15 +7796,9 @@
       }
     },
     "node_modules/react-hook-form": {
-<<<<<<< HEAD
       "version": "7.46.2",
       "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.46.2.tgz",
       "integrity": "sha512-x1DWmHQchV7x2Rq9l99M/cQHC8JGchAnw9Z0uTz5KrPa0bTl/Inm1NR7ceOARfIrkNuQNAhuSuZPYa6k7QYn3Q==",
-=======
-      "version": "7.45.4",
-      "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.45.4.tgz",
-      "integrity": "sha512-HGDV1JOOBPZj10LB3+OZgfDBTn+IeEsNOKiq/cxbQAIbKaiJUe/KV8DBUzsx0Gx/7IG/orWqRRm736JwOfUSWQ==",
->>>>>>> 03afed696e270d782cc5a3e8f600f823bd2fa562
       "engines": {
         "node": ">=12.22.0"
       },
@@ -8154,19 +7894,11 @@
       "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="
     },
     "node_modules/react-router": {
-<<<<<<< HEAD
       "version": "6.16.0",
       "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.16.0.tgz",
       "integrity": "sha512-VT4Mmc4jj5YyjpOi5jOf0I+TYzGpvzERy4ckNSvSh2RArv8LLoCxlsZ2D+tc7zgjxcY34oTz2hZaeX5RVprKqA==",
       "dependencies": {
         "@remix-run/router": "1.9.0"
-=======
-      "version": "6.15.0",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.15.0.tgz",
-      "integrity": "sha512-NIytlzvzLwJkCQj2HLefmeakxxWHWAP+02EGqWEZy+DgfHHKQMUoBBjUQLOtFInBMhWtb3hiUy6MfFgwLjXhqg==",
-      "dependencies": {
-        "@remix-run/router": "1.8.0"
->>>>>>> 03afed696e270d782cc5a3e8f600f823bd2fa562
       },
       "engines": {
         "node": ">=14.0.0"
@@ -8176,21 +7908,12 @@
       }
     },
     "node_modules/react-router-dom": {
-<<<<<<< HEAD
       "version": "6.16.0",
       "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.16.0.tgz",
       "integrity": "sha512-aTfBLv3mk/gaKLxgRDUPbPw+s4Y/O+ma3rEN1u8EgEpLpPe6gNjIsWt9rxushMHHMb7mSwxRGdGlGdvmFsyPIg==",
       "dependencies": {
         "@remix-run/router": "1.9.0",
         "react-router": "6.16.0"
-=======
-      "version": "6.15.0",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.15.0.tgz",
-      "integrity": "sha512-aR42t0fs7brintwBGAv2+mGlCtgtFQeOzK0BM1/OiqEzRejOZtpMZepvgkscpMUnKb8YO84G7s3LsHnnDNonbQ==",
-      "dependencies": {
-        "@remix-run/router": "1.8.0",
-        "react-router": "6.15.0"
->>>>>>> 03afed696e270d782cc5a3e8f600f823bd2fa562
       },
       "engines": {
         "node": ">=14.0.0"
@@ -8270,15 +7993,9 @@
       }
     },
     "node_modules/regenerator-runtime": {
-<<<<<<< HEAD
       "version": "0.13.11",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
       "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==",
-=======
-      "version": "0.13.10",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.10.tgz",
-      "integrity": "sha512-KepLsg4dU12hryUO7bp/axHAKvwGOCV0sGloQtpagJ12ai+ojVDqkeGSiRX1zlq+kjIMZ1t7gpze+26QqtdGqw==",
->>>>>>> 03afed696e270d782cc5a3e8f600f823bd2fa562
       "dev": true
     },
     "node_modules/regenerator-transform": {