diff --git a/code/web/task_schedule/yarn.lock b/code/web/task_schedule/yarn.lock
index ab636c0..debdc58 100644
--- a/code/web/task_schedule/yarn.lock
+++ b/code/web/task_schedule/yarn.lock
@@ -53,15 +53,9 @@
     "semver" "^6.3.0"
 
 "@babel/eslint-parser@^7.21.3":
-<<<<<<< HEAD
   "integrity" "sha512-kfhmPimwo6k4P8zxNs8+T7yR44q1LdpsZdE1NkCsVlfiuTPRfnGgjaF8Qgug9q9Pou17u6wneYF0lDCZJATMFg=="
   "resolved" "https://registry.npmmirror.com/@babel/eslint-parser/-/eslint-parser-7.21.3.tgz"
   "version" "7.21.3"
-=======
-  version "7.21.3"
-  resolved "https://registry.npmmirror.com/@babel/eslint-parser/-/eslint-parser-7.21.3.tgz"
-  integrity sha512-kfhmPimwo6k4P8zxNs8+T7yR44q1LdpsZdE1NkCsVlfiuTPRfnGgjaF8Qgug9q9Pou17u6wneYF0lDCZJATMFg==
->>>>>>> e1cc6b91948cbc21c00a441e8d481f5764826609
   dependencies:
     "@nicolo-ribaudo/eslint-scope-5-internals" "5.1.1-v1"
     "eslint-visitor-keys" "^2.1.0"
@@ -226,48 +220,26 @@
   "version" "0.5.7"
 
 "@element-plus/icons-vue@^2.0.6", "@element-plus/icons-vue@^2.1.0":
-<<<<<<< HEAD
   "integrity" "sha512-PSBn3elNoanENc1vnCfh+3WA9fimRC7n+fWkf3rE5jvv+aBohNHABC/KAR5KWPecxWxDTVT1ERpRbOMRcOV/vA=="
   "resolved" "https://registry.npmmirror.com/@element-plus/icons-vue/-/icons-vue-2.1.0.tgz"
   "version" "2.1.0"
 
-"@esbuild/win32-x64@0.17.11":
-  "integrity" "sha512-N9vXqLP3eRL8BqSy8yn4Y98cZI2pZ8fyuHx6lKjiG2WABpT2l01TXdzq5Ma2ZUBzfB7tx5dXVhge8X9u0S70ZQ=="
-  "resolved" "https://registry.npmmirror.com/@esbuild/win32-x64/-/win32-x64-0.17.11.tgz"
-  "version" "0.17.11"
+"@esbuild/win32-x64@0.17.14":
+  "integrity" "sha512-gPQmsi2DKTaEgG14hc3CHXHp62k8g6qr0Pas+I4lUxRMugGSATh/Bi8Dgusoz9IQ0IfdrvLpco6kujEIBoaogA=="
+  "resolved" "https://registry.npmmirror.com/@esbuild/win32-x64/-/win32-x64-0.17.14.tgz"
+  "version" "0.17.14"
 
 "@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.3.0":
   "integrity" "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA=="
   "resolved" "https://registry.npmmirror.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz"
   "version" "4.4.0"
-=======
-  version "2.1.0"
-  resolved "https://registry.npmmirror.com/@element-plus/icons-vue/-/icons-vue-2.1.0.tgz"
-  integrity sha512-PSBn3elNoanENc1vnCfh+3WA9fimRC7n+fWkf3rE5jvv+aBohNHABC/KAR5KWPecxWxDTVT1ERpRbOMRcOV/vA==
-
-"@esbuild/win32-x64@0.17.14":
-  version "0.17.14"
-  resolved "https://registry.npmmirror.com/@esbuild/win32-x64/-/win32-x64-0.17.14.tgz"
-  integrity sha512-gPQmsi2DKTaEgG14hc3CHXHp62k8g6qr0Pas+I4lUxRMugGSATh/Bi8Dgusoz9IQ0IfdrvLpco6kujEIBoaogA==
-
-"@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.3.0":
-  version "4.4.0"
-  resolved "https://registry.npmmirror.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz"
-  integrity sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==
->>>>>>> e1cc6b91948cbc21c00a441e8d481f5764826609
   dependencies:
     "eslint-visitor-keys" "^3.3.0"
 
 "@eslint-community/regexpp@^4.4.0":
-<<<<<<< HEAD
-  "integrity" "sha512-A9983Q0LnDGdLPjxyXQ00sbV+K+O+ko2Dr+CZigbHWtX9pNfxlaBkMR8X1CztI73zuEyEBXTVjx7CE+/VSwDiQ=="
-  "resolved" "https://registry.npmmirror.com/@eslint-community/regexpp/-/regexpp-4.4.0.tgz"
-  "version" "4.4.0"
-=======
-  version "4.4.1"
-  resolved "https://registry.npmmirror.com/@eslint-community/regexpp/-/regexpp-4.4.1.tgz"
-  integrity sha512-BISJ6ZE4xQsuL/FmsyRaiffpq977bMlsKfGHTQrOGFErfByxIe6iZTxPf/00Zon9b9a7iUykfQwejN3s2ZW/Bw==
->>>>>>> e1cc6b91948cbc21c00a441e8d481f5764826609
+  "integrity" "sha512-BISJ6ZE4xQsuL/FmsyRaiffpq977bMlsKfGHTQrOGFErfByxIe6iZTxPf/00Zon9b9a7iUykfQwejN3s2ZW/Bw=="
+  "resolved" "https://registry.npmmirror.com/@eslint-community/regexpp/-/regexpp-4.4.1.tgz"
+  "version" "4.4.1"
 
 "@eslint/eslintrc@^2.0.1":
   "integrity" "sha512-eFRmABvW2E5Ho6f5fHLqgena46rOj7r7OKHYfLElqcBfGFHHpjBhivyi5+jOEQuSpdc/1phIZJlbC2te+tZNIw=="
@@ -289,27 +261,15 @@
   "resolved" "https://registry.npmmirror.com/@eslint/js/-/js-8.36.0.tgz"
   "version" "8.36.0"
 
-<<<<<<< HEAD
-"@floating-ui/core@^1.2.3":
-  "integrity" "sha512-SQOeVbMwb1di+mVWWJLpsUTToKfqVNioXys011beCAhyOIFtS+GQoW4EQSneuxzmQKddExDwQ+X0hLl4lJJaSQ=="
-  "resolved" "https://registry.npmmirror.com/@floating-ui/core/-/core-1.2.4.tgz"
-  "version" "1.2.4"
-
-"@floating-ui/dom@^1.0.1":
-  "integrity" "sha512-4+k+BLhtWj+peCU60gp0+rHeR8+Ohqx6kjJf/lHMnJ8JD5Qj6jytcq1+SZzRwD7rvHKRhR7TDiWWddrNrfwQLg=="
-  "resolved" "https://registry.npmmirror.com/@floating-ui/dom/-/dom-1.2.4.tgz"
-  "version" "1.2.4"
-=======
 "@floating-ui/core@^1.2.4":
-  version "1.2.5"
-  resolved "https://registry.npmmirror.com/@floating-ui/core/-/core-1.2.5.tgz"
-  integrity sha512-qrcbyfnRVziRlB6IYwjCopYhO7Vud750JlJyuljruIXcPxr22y8zdckcJGsuOdnQ639uVD1tTXddrcH3t3QYIQ==
+  "integrity" "sha512-qrcbyfnRVziRlB6IYwjCopYhO7Vud750JlJyuljruIXcPxr22y8zdckcJGsuOdnQ639uVD1tTXddrcH3t3QYIQ=="
+  "resolved" "https://registry.npmmirror.com/@floating-ui/core/-/core-1.2.5.tgz"
+  "version" "1.2.5"
 
 "@floating-ui/dom@^1.0.1":
-  version "1.2.5"
-  resolved "https://registry.npmmirror.com/@floating-ui/dom/-/dom-1.2.5.tgz"
-  integrity sha512-+sAUfpQ3Frz+VCbPCqj+cZzvEESy3fjSeT/pDWkYCWOBXYNNKZfuVsHuv8/JO2zze8+Eb/Q7a6hZVgzS81fLbQ==
->>>>>>> e1cc6b91948cbc21c00a441e8d481f5764826609
+  "integrity" "sha512-+sAUfpQ3Frz+VCbPCqj+cZzvEESy3fjSeT/pDWkYCWOBXYNNKZfuVsHuv8/JO2zze8+Eb/Q7a6hZVgzS81fLbQ=="
+  "resolved" "https://registry.npmmirror.com/@floating-ui/dom/-/dom-1.2.5.tgz"
+  "version" "1.2.5"
   dependencies:
     "@floating-ui/core" "^1.2.4"
 
@@ -527,15 +487,9 @@
     "@types/estree" "*"
 
 "@types/eslint@*", "@types/eslint@^7.29.0 || ^8.4.1":
-<<<<<<< HEAD
-  "integrity" "sha512-EMpxUyystd3uZVByZap1DACsMXvb82ypQnGn89e1Y0a+LYu3JJscUd/gqhRsVFDkaD2MIiWo0MT8EfXr3DGRKw=="
-  "resolved" "https://registry.npmmirror.com/@types/eslint/-/eslint-8.21.2.tgz"
-  "version" "8.21.2"
-=======
-  version "8.21.3"
-  resolved "https://registry.npmmirror.com/@types/eslint/-/eslint-8.21.3.tgz"
-  integrity sha512-fa7GkppZVEByMWGbTtE5MbmXWJTVbrjjaS8K6uQj+XtuuUv1fsuPAxhygfqLmsb/Ufb3CV8deFCpiMfAgi00Sw==
->>>>>>> e1cc6b91948cbc21c00a441e8d481f5764826609
+  "integrity" "sha512-fa7GkppZVEByMWGbTtE5MbmXWJTVbrjjaS8K6uQj+XtuuUv1fsuPAxhygfqLmsb/Ufb3CV8deFCpiMfAgi00Sw=="
+  "resolved" "https://registry.npmmirror.com/@types/eslint/-/eslint-8.21.3.tgz"
+  "version" "8.21.3"
   dependencies:
     "@types/estree" "*"
     "@types/json-schema" "*"
@@ -614,15 +568,9 @@
   "version" "1.2.2"
 
 "@types/node@*", "@types/node@>= 14":
-<<<<<<< HEAD
-  "integrity" "sha512-p6ua9zBxz5otCmbpb5D3U4B5Nanw6Pk3PPyX05xnxbB/fRv71N7CPmORg7uAD5P70T0xmx1pzAx/FUfa5X+3cw=="
-  "resolved" "https://registry.npmmirror.com/@types/node/-/node-18.15.3.tgz"
-  "version" "18.15.3"
-=======
-  version "18.15.10"
-  resolved "https://registry.npmmirror.com/@types/node/-/node-18.15.10.tgz"
-  integrity sha512-9avDaQJczATcXgfmMAW3MIWArOO7A+m90vuCFLr8AotWf8igO/mRoYukrk2cqZVtv38tHs33retzHEilM7FpeQ==
->>>>>>> e1cc6b91948cbc21c00a441e8d481f5764826609
+  "integrity" "sha512-9avDaQJczATcXgfmMAW3MIWArOO7A+m90vuCFLr8AotWf8igO/mRoYukrk2cqZVtv38tHs33retzHEilM7FpeQ=="
+  "resolved" "https://registry.npmmirror.com/@types/node/-/node-18.15.10.tgz"
+  "version" "18.15.10"
 
 "@types/normalize-package-data@^2.4.0":
   "integrity" "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw=="
@@ -689,21 +637,14 @@
     "@types/node" "*"
 
 "@typescript-eslint/eslint-plugin@^5.43.0", "@typescript-eslint/eslint-plugin@^5.56.0":
-<<<<<<< HEAD
   "integrity" "sha512-ZNW37Ccl3oMZkzxrYDUX4o7cnuPgU+YrcaYXzsRtLB16I1FR5SHMqga3zGsaSliZADCWo2v8qHWqAYIj8nWCCg=="
   "resolved" "https://registry.npmmirror.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.56.0.tgz"
   "version" "5.56.0"
-=======
-  version "5.56.0"
-  resolved "https://registry.npmmirror.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.56.0.tgz"
-  integrity sha512-ZNW37Ccl3oMZkzxrYDUX4o7cnuPgU+YrcaYXzsRtLB16I1FR5SHMqga3zGsaSliZADCWo2v8qHWqAYIj8nWCCg==
->>>>>>> e1cc6b91948cbc21c00a441e8d481f5764826609
   dependencies:
     "@eslint-community/regexpp" "^4.4.0"
     "@typescript-eslint/scope-manager" "5.56.0"
     "@typescript-eslint/type-utils" "5.56.0"
     "@typescript-eslint/utils" "5.56.0"
-<<<<<<< HEAD
     "debug" "^4.3.4"
     "grapheme-splitter" "^1.0.4"
     "ignore" "^5.2.0"
@@ -715,44 +656,21 @@
   "integrity" "sha512-sn1OZmBxUsgxMmR8a8U5QM/Wl+tyqlH//jTqCg8daTAmhAk26L2PFhcqPLlYBhYUJMZJK276qLXlHN3a83o2cg=="
   "resolved" "https://registry.npmmirror.com/@typescript-eslint/parser/-/parser-5.56.0.tgz"
   "version" "5.56.0"
-=======
-    debug "^4.3.4"
-    grapheme-splitter "^1.0.4"
-    ignore "^5.2.0"
-    natural-compare-lite "^1.4.0"
-    semver "^7.3.7"
-    tsutils "^3.21.0"
-
-"@typescript-eslint/parser@^5.0.0", "@typescript-eslint/parser@^5.43.0", "@typescript-eslint/parser@^5.56.0":
-  version "5.56.0"
-  resolved "https://registry.npmmirror.com/@typescript-eslint/parser/-/parser-5.56.0.tgz"
-  integrity sha512-sn1OZmBxUsgxMmR8a8U5QM/Wl+tyqlH//jTqCg8daTAmhAk26L2PFhcqPLlYBhYUJMZJK276qLXlHN3a83o2cg==
->>>>>>> e1cc6b91948cbc21c00a441e8d481f5764826609
   dependencies:
     "@typescript-eslint/scope-manager" "5.56.0"
     "@typescript-eslint/types" "5.56.0"
     "@typescript-eslint/typescript-estree" "5.56.0"
-<<<<<<< HEAD
     "debug" "^4.3.4"
 
 "@typescript-eslint/scope-manager@5.56.0":
   "integrity" "sha512-jGYKyt+iBakD0SA5Ww8vFqGpoV2asSjwt60Gl6YcO8ksQ8s2HlUEyHBMSa38bdLopYqGf7EYQMUIGdT/Luw+sw=="
   "resolved" "https://registry.npmmirror.com/@typescript-eslint/scope-manager/-/scope-manager-5.56.0.tgz"
   "version" "5.56.0"
-=======
-    debug "^4.3.4"
-
-"@typescript-eslint/scope-manager@5.56.0":
-  version "5.56.0"
-  resolved "https://registry.npmmirror.com/@typescript-eslint/scope-manager/-/scope-manager-5.56.0.tgz"
-  integrity sha512-jGYKyt+iBakD0SA5Ww8vFqGpoV2asSjwt60Gl6YcO8ksQ8s2HlUEyHBMSa38bdLopYqGf7EYQMUIGdT/Luw+sw==
->>>>>>> e1cc6b91948cbc21c00a441e8d481f5764826609
   dependencies:
     "@typescript-eslint/types" "5.56.0"
     "@typescript-eslint/visitor-keys" "5.56.0"
 
 "@typescript-eslint/type-utils@5.56.0":
-<<<<<<< HEAD
   "integrity" "sha512-8WxgOgJjWRy6m4xg9KoSHPzBNZeQbGlQOH7l2QEhQID/+YseaFxg5J/DLwWSsi9Axj4e/cCiKx7PVzOq38tY4A=="
   "resolved" "https://registry.npmmirror.com/@typescript-eslint/type-utils/-/type-utils-5.56.0.tgz"
   "version" "5.56.0"
@@ -784,39 +702,6 @@
   "integrity" "sha512-XhZDVdLnUJNtbzaJeDSCIYaM+Tgr59gZGbFuELgF7m0IY03PlciidS7UQNKLE0+WpUTn1GlycEr6Ivb/afjbhA=="
   "resolved" "https://registry.npmmirror.com/@typescript-eslint/utils/-/utils-5.56.0.tgz"
   "version" "5.56.0"
-=======
-  version "5.56.0"
-  resolved "https://registry.npmmirror.com/@typescript-eslint/type-utils/-/type-utils-5.56.0.tgz"
-  integrity sha512-8WxgOgJjWRy6m4xg9KoSHPzBNZeQbGlQOH7l2QEhQID/+YseaFxg5J/DLwWSsi9Axj4e/cCiKx7PVzOq38tY4A==
-  dependencies:
-    "@typescript-eslint/typescript-estree" "5.56.0"
-    "@typescript-eslint/utils" "5.56.0"
-    debug "^4.3.4"
-    tsutils "^3.21.0"
-
-"@typescript-eslint/types@5.56.0":
-  version "5.56.0"
-  resolved "https://registry.npmmirror.com/@typescript-eslint/types/-/types-5.56.0.tgz"
-  integrity sha512-JyAzbTJcIyhuUhogmiu+t79AkdnqgPUEsxMTMc/dCZczGMJQh1MK2wgrju++yMN6AWroVAy2jxyPcPr3SWCq5w==
-
-"@typescript-eslint/typescript-estree@5.56.0":
-  version "5.56.0"
-  resolved "https://registry.npmmirror.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.56.0.tgz"
-  integrity sha512-41CH/GncsLXOJi0jb74SnC7jVPWeVJ0pxQj8bOjH1h2O26jXN3YHKDT1ejkVz5YeTEQPeLCCRY0U2r68tfNOcg==
-  dependencies:
-    "@typescript-eslint/types" "5.56.0"
-    "@typescript-eslint/visitor-keys" "5.56.0"
-    debug "^4.3.4"
-    globby "^11.1.0"
-    is-glob "^4.0.3"
-    semver "^7.3.7"
-    tsutils "^3.21.0"
-
-"@typescript-eslint/utils@5.56.0":
-  version "5.56.0"
-  resolved "https://registry.npmmirror.com/@typescript-eslint/utils/-/utils-5.56.0.tgz"
-  integrity sha512-XhZDVdLnUJNtbzaJeDSCIYaM+Tgr59gZGbFuELgF7m0IY03PlciidS7UQNKLE0+WpUTn1GlycEr6Ivb/afjbhA==
->>>>>>> e1cc6b91948cbc21c00a441e8d481f5764826609
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
     "@types/json-schema" "^7.0.9"
@@ -824,7 +709,6 @@
     "@typescript-eslint/scope-manager" "5.56.0"
     "@typescript-eslint/types" "5.56.0"
     "@typescript-eslint/typescript-estree" "5.56.0"
-<<<<<<< HEAD
     "eslint-scope" "^5.1.1"
     "semver" "^7.3.7"
 
@@ -840,23 +724,6 @@
   "integrity" "sha512-++9JOAFdcXI3lyer9UKUV4rfoQ3T1RN8yDqoCLar86s0xQct5yblxAE+yWgRnU5/0FOlVCpTZpYSBV/bGWrSrQ=="
   "resolved" "https://registry.npmmirror.com/@vitejs/plugin-vue/-/plugin-vue-4.1.0.tgz"
   "version" "4.1.0"
-=======
-    eslint-scope "^5.1.1"
-    semver "^7.3.7"
-
-"@typescript-eslint/visitor-keys@5.56.0":
-  version "5.56.0"
-  resolved "https://registry.npmmirror.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.56.0.tgz"
-  integrity sha512-1mFdED7u5bZpX6Xxf5N9U2c18sb+8EvU3tyOIj6LQZ5OOvnmj8BVeNNP603OFPm5KkS1a7IvCIcwrdHXaEMG/Q==
-  dependencies:
-    "@typescript-eslint/types" "5.56.0"
-    eslint-visitor-keys "^3.3.0"
-
-"@vitejs/plugin-vue@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.npmmirror.com/@vitejs/plugin-vue/-/plugin-vue-4.1.0.tgz"
-  integrity sha512-++9JOAFdcXI3lyer9UKUV4rfoQ3T1RN8yDqoCLar86s0xQct5yblxAE+yWgRnU5/0FOlVCpTZpYSBV/bGWrSrQ==
->>>>>>> e1cc6b91948cbc21c00a441e8d481f5764826609
 
 "@vue/cli-overlay@^5.0.8":
   "integrity" "sha512-KmtievE/B4kcXp6SuM2gzsnSd8WebkQpg3XaB6GmFh1BJGRqa1UiW9up7L/Q67uOdTigHxr5Ar2lZms4RcDjwQ=="
@@ -1607,17 +1474,10 @@
     "type-is" "~1.6.18"
     "unpipe" "1.0.0"
 
-<<<<<<< HEAD
 "bonjour-service@^1.0.11":
-  "integrity" "sha512-LVRinRB3k1/K0XzZ2p58COnWvkQknIY6sf0zF2rpErvcJXpMBttEPQSxK+HEXSS9VmpZlDoDnQWv8ftJT20B0Q=="
-  "resolved" "https://registry.npmmirror.com/bonjour-service/-/bonjour-service-1.1.0.tgz"
-  "version" "1.1.0"
-=======
-bonjour-service@^1.0.11:
-  version "1.1.1"
-  resolved "https://registry.npmmirror.com/bonjour-service/-/bonjour-service-1.1.1.tgz"
-  integrity sha512-Z/5lQRMOG9k7W+FkeGTNjh7htqn/2LMnfOvBZ8pynNZCM9MwkQkI3zeI4oz09uWdcgmgHugVvBqxGg4VQJ5PCg==
->>>>>>> e1cc6b91948cbc21c00a441e8d481f5764826609
+  "integrity" "sha512-Z/5lQRMOG9k7W+FkeGTNjh7htqn/2LMnfOvBZ8pynNZCM9MwkQkI3zeI4oz09uWdcgmgHugVvBqxGg4VQJ5PCg=="
+  "resolved" "https://registry.npmmirror.com/bonjour-service/-/bonjour-service-1.1.1.tgz"
+  "version" "1.1.1"
   dependencies:
     "array-flatten" "^2.1.2"
     "dns-equal" "^1.0.0"
@@ -1715,17 +1575,10 @@ bonjour-service@^1.0.11:
     "lodash.memoize" "^4.1.2"
     "lodash.uniq" "^4.5.0"
 
-<<<<<<< HEAD
 "caniuse-lite@^1.0.0", "caniuse-lite@^1.0.30001449", "caniuse-lite@^1.0.30001464":
-  "integrity" "sha512-ewtFBSfWjEmxUgNBSZItFSmVtvk9zkwkl1OfRZlKA8slltRN+/C/tuGVrF9styXkN36Yu3+SeJ1qkXxDEyNZ5w=="
-  "resolved" "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001466.tgz"
-  "version" "1.0.30001466"
-=======
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001449, caniuse-lite@^1.0.30001464:
-  version "1.0.30001470"
-  resolved "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001470.tgz"
-  integrity sha512-065uNwY6QtHCBOExzbV6m236DDhYCCtPmQUCoQtwkVqzud8v5QPidoMr6CoMkC2nfp6nksjttqWQRRh75LqUmA==
->>>>>>> e1cc6b91948cbc21c00a441e8d481f5764826609
+  "integrity" "sha512-065uNwY6QtHCBOExzbV6m236DDhYCCtPmQUCoQtwkVqzud8v5QPidoMr6CoMkC2nfp6nksjttqWQRRh75LqUmA=="
+  "resolved" "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001470.tgz"
+  "version" "1.0.30001470"
 
 "case-sensitive-paths-webpack-plugin@^2.3.0":
   "integrity" "sha512-roIFONhcxog0JSSWbvVAh3OocukmSgpqOH6YpMkCvav/ySIV3JKg4Dc8vYtQjYi/UxpNE36r/9v+VqTQqgkYmw=="
@@ -2066,17 +1919,10 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001449, caniuse-lite@^1.0.30001464:
     "shebang-command" "^2.0.0"
     "which" "^2.0.1"
 
-<<<<<<< HEAD
 "css-declaration-sorter@^6.3.1":
-  "integrity" "sha512-fBffmak0bPAnyqc/HO8C3n2sHrp9wcqQz6ES9koRF2/mLOVAx9zIQ3Y7R29sYCteTPqMCwns4WYQoCX91Xl3+w=="
-  "resolved" "https://registry.npmmirror.com/css-declaration-sorter/-/css-declaration-sorter-6.3.1.tgz"
-  "version" "6.3.1"
-=======
-css-declaration-sorter@^6.3.1:
-  version "6.4.0"
-  resolved "https://registry.npmmirror.com/css-declaration-sorter/-/css-declaration-sorter-6.4.0.tgz"
-  integrity sha512-jDfsatwWMWN0MODAFuHszfjphEXfNw9JUAhmY4pLu3TyTU+ohUpsbVtbU+1MZn4a47D9kqh03i4eyOm+74+zew==
->>>>>>> e1cc6b91948cbc21c00a441e8d481f5764826609
+  "integrity" "sha512-jDfsatwWMWN0MODAFuHszfjphEXfNw9JUAhmY4pLu3TyTU+ohUpsbVtbU+1MZn4a47D9kqh03i4eyOm+74+zew=="
+  "resolved" "https://registry.npmmirror.com/css-declaration-sorter/-/css-declaration-sorter-6.4.0.tgz"
+  "version" "6.4.0"
 
 "css-loader@*", "css-loader@^6.5.0":
   "integrity" "sha512-qhOH1KlBMnZP8FzRO6YCH9UHXQhVMcEGLyNdb7Hv2cpcmJbW0YrddO+tG1ab5nT41KpHIYGsbeHqxB9xPu1pKQ=="
@@ -2380,7 +2226,6 @@ css-declaration-sorter@^6.3.1:
   "resolved" "https://registry.npmmirror.com/easy-stack/-/easy-stack-1.0.1.tgz"
   "version" "1.0.1"
 
-<<<<<<< HEAD
 "echarts@^5.4.2":
   "integrity" "sha512-2W3vw3oI2tWJdyAz+b8DuWS0nfXtSDqlDmqgin/lfzbkB01cuMEN66KWBlmur3YMp5nEDEEt5s23pllnAzB4EA=="
   "resolved" "https://registry.npmmirror.com/echarts/-/echarts-5.4.2.tgz"
@@ -2388,42 +2233,21 @@ css-declaration-sorter@^6.3.1:
   dependencies:
     "tslib" "2.3.0"
     "zrender" "5.4.3"
-=======
-echarts@^5.4.2:
-  version "5.4.2"
-  resolved "https://registry.npmmirror.com/echarts/-/echarts-5.4.2.tgz"
-  integrity sha512-2W3vw3oI2tWJdyAz+b8DuWS0nfXtSDqlDmqgin/lfzbkB01cuMEN66KWBlmur3YMp5nEDEEt5s23pllnAzB4EA==
-  dependencies:
-    tslib "2.3.0"
-    zrender "5.4.3"
->>>>>>> e1cc6b91948cbc21c00a441e8d481f5764826609
 
 "ee-first@1.1.1":
   "integrity" "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
   "resolved" "https://registry.npmmirror.com/ee-first/-/ee-first-1.1.1.tgz"
   "version" "1.1.1"
 
-<<<<<<< HEAD
 "electron-to-chromium@^1.4.284":
-  "integrity" "sha512-c1Vbv5tuUlBFp0mb3mCIjw+REEsgthRgNE8BlbEDKmvzb8rxjcVki6OkQP83vLN34s0XCxpSkq7AZNep1a6xhw=="
-  "resolved" "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.332.tgz"
-  "version" "1.4.332"
+  "integrity" "sha512-zx8hqumOqltKsv/MF50yvdAlPF9S/4PXbyfzJS6ZGhbddGkRegdwImmfSVqCkEziYzrIGZ/TlrzBND4FysfkDg=="
+  "resolved" "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.340.tgz"
+  "version" "1.4.340"
 
 "element-plus@^2.3.1":
   "integrity" "sha512-IBS7ic1mRyDXpOreRkredV4ByZSuax5HPb0zNOHm4qwKC4wm927yQv+Is0JbzxPzCW5zWaV4PLy9/Gl3E3v59w=="
   "resolved" "https://registry.npmmirror.com/element-plus/-/element-plus-2.3.1.tgz"
   "version" "2.3.1"
-=======
-electron-to-chromium@^1.4.284:
-  version "1.4.340"
-  resolved "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.340.tgz"
-  integrity sha512-zx8hqumOqltKsv/MF50yvdAlPF9S/4PXbyfzJS6ZGhbddGkRegdwImmfSVqCkEziYzrIGZ/TlrzBND4FysfkDg==
-
-element-plus@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.npmmirror.com/element-plus/-/element-plus-2.3.1.tgz"
-  integrity sha512-IBS7ic1mRyDXpOreRkredV4ByZSuax5HPb0zNOHm4qwKC4wm927yQv+Is0JbzxPzCW5zWaV4PLy9/Gl3E3v59w==
->>>>>>> e1cc6b91948cbc21c00a441e8d481f5764826609
   dependencies:
     "@ctrl/tinycolor" "^3.4.1"
     "@element-plus/icons-vue" "^2.0.6"
@@ -2565,17 +2389,10 @@ element-plus@^2.3.1:
     "is-date-object" "^1.0.1"
     "is-symbol" "^1.0.2"
 
-<<<<<<< HEAD
 "esbuild@^0.17.5":
-  "integrity" "sha512-pAMImyokbWDtnA/ufPxjQg0fYo2DDuzAlqwnDvbXqHLphe+m80eF++perYKVm8LeTuj2zUuFXC+xgSVxyoHUdg=="
-  "resolved" "https://registry.npmmirror.com/esbuild/-/esbuild-0.17.11.tgz"
-  "version" "0.17.11"
-=======
-esbuild@^0.17.5:
-  version "0.17.14"
-  resolved "https://registry.npmmirror.com/esbuild/-/esbuild-0.17.14.tgz"
-  integrity sha512-vOO5XhmVj/1XQR9NQ1UPq6qvMYL7QFJU57J5fKBKBKxp17uDt5PgxFDb4A2nEiXhr1qQs4x0F5+66hVVw4ruNw==
->>>>>>> e1cc6b91948cbc21c00a441e8d481f5764826609
+  "integrity" "sha512-vOO5XhmVj/1XQR9NQ1UPq6qvMYL7QFJU57J5fKBKBKxp17uDt5PgxFDb4A2nEiXhr1qQs4x0F5+66hVVw4ruNw=="
+  "resolved" "https://registry.npmmirror.com/esbuild/-/esbuild-0.17.14.tgz"
+  "version" "0.17.14"
   optionalDependencies:
     "@esbuild/android-arm" "0.17.14"
     "@esbuild/android-arm64" "0.17.14"
@@ -2658,17 +2475,10 @@ esbuild@^0.17.5:
     "eslint-config-node" "^4.1.0"
     "eslint-config-react-native" "^4.1.0"
 
-<<<<<<< HEAD
 "eslint-config-standard-with-typescript@^34.0.1":
   "integrity" "sha512-J7WvZeLtd0Vr9F+v4dZbqJCLD16cbIy4U+alJMq4MiXdpipdBM3U5NkXaGUjePc4sb1ZE01U9g6VuTBpHHz1fg=="
   "resolved" "https://registry.npmmirror.com/eslint-config-standard-with-typescript/-/eslint-config-standard-with-typescript-34.0.1.tgz"
   "version" "34.0.1"
-=======
-eslint-config-standard-with-typescript@^34.0.1:
-  version "34.0.1"
-  resolved "https://registry.npmmirror.com/eslint-config-standard-with-typescript/-/eslint-config-standard-with-typescript-34.0.1.tgz"
-  integrity sha512-J7WvZeLtd0Vr9F+v4dZbqJCLD16cbIy4U+alJMq4MiXdpipdBM3U5NkXaGUjePc4sb1ZE01U9g6VuTBpHHz1fg==
->>>>>>> e1cc6b91948cbc21c00a441e8d481f5764826609
   dependencies:
     "@typescript-eslint/parser" "^5.43.0"
     "eslint-config-standard" "17.0.0"
@@ -2783,7 +2593,6 @@ eslint-config-standard-with-typescript@^34.0.1:
     "semver" "^6.3.0"
     "string.prototype.matchall" "^4.0.8"
 
-<<<<<<< HEAD
 "eslint-plugin-vue@^9.10.0":
   "integrity" "sha512-2MgP31OBf8YilUvtakdVMc8xVbcMp7z7/iQj8LHVpXrSXHPXSJRUIGSPFI6b6pyCx/buKaFJ45ycqfHvQRiW2g=="
   "resolved" "https://registry.npmmirror.com/eslint-plugin-vue/-/eslint-plugin-vue-9.10.0.tgz"
@@ -2796,20 +2605,6 @@ eslint-config-standard-with-typescript@^34.0.1:
     "semver" "^7.3.5"
     "vue-eslint-parser" "^9.0.1"
     "xml-name-validator" "^4.0.0"
-=======
-eslint-plugin-vue@^9.10.0:
-  version "9.10.0"
-  resolved "https://registry.npmmirror.com/eslint-plugin-vue/-/eslint-plugin-vue-9.10.0.tgz"
-  integrity sha512-2MgP31OBf8YilUvtakdVMc8xVbcMp7z7/iQj8LHVpXrSXHPXSJRUIGSPFI6b6pyCx/buKaFJ45ycqfHvQRiW2g==
-  dependencies:
-    "@eslint-community/eslint-utils" "^4.3.0"
-    natural-compare "^1.4.0"
-    nth-check "^2.0.1"
-    postcss-selector-parser "^6.0.9"
-    semver "^7.3.5"
-    vue-eslint-parser "^9.0.1"
-    xml-name-validator "^4.0.0"
->>>>>>> e1cc6b91948cbc21c00a441e8d481f5764826609
 
 "eslint-rule-composer@^0.3.0":
   "integrity" "sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg=="
@@ -2884,17 +2679,10 @@ eslint-plugin-vue@^9.10.0:
     "normalize-path" "^3.0.0"
     "schema-utils" "^4.0.0"
 
-<<<<<<< HEAD
 "eslint@*", "eslint@^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8", "eslint@^3 || ^4 || ^5 || ^6 || ^7 || ^8", "eslint@^6.0.0 || ^7.0.0 || ^8.0.0", "eslint@^6.0.0 || ^7.0.0 || >=8.0.0", "eslint@^6.2.0 || ^7.0.0 || ^8.0.0", "eslint@^7.0.0 || ^8.0.0", "eslint@^7.5.0 || ^8.0.0", "eslint@^8.0.1", "eslint@^8.36.0", "eslint@>= 4.12.1", "eslint@>=4.0.0", "eslint@>=4.19.1", "eslint@>=5", "eslint@>=6.0.0", "eslint@>=7.0.0", "eslint@>=7.5.0":
   "integrity" "sha512-Y956lmS7vDqomxlaaQAHVmeb4tNMp2FWIvU/RnU5BD3IKMD/MJPr76xdyr68P8tV1iNMvN2mRK0yy3c+UjL+bw=="
   "resolved" "https://registry.npmmirror.com/eslint/-/eslint-8.36.0.tgz"
   "version" "8.36.0"
-=======
-eslint@*, "eslint@^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8", "eslint@^3 || ^4 || ^5 || ^6 || ^7 || ^8", "eslint@^6.0.0 || ^7.0.0 || ^8.0.0", "eslint@^6.0.0 || ^7.0.0 || >=8.0.0", "eslint@^6.2.0 || ^7.0.0 || ^8.0.0", "eslint@^7.0.0 || ^8.0.0", "eslint@^7.5.0 || ^8.0.0", eslint@^8.0.1, eslint@^8.36.0, "eslint@>= 4.12.1", eslint@>=4.0.0, eslint@>=4.19.1, eslint@>=5, eslint@>=6.0.0, eslint@>=7.0.0, eslint@>=7.5.0:
-  version "8.36.0"
-  resolved "https://registry.npmmirror.com/eslint/-/eslint-8.36.0.tgz"
-  integrity sha512-Y956lmS7vDqomxlaaQAHVmeb4tNMp2FWIvU/RnU5BD3IKMD/MJPr76xdyr68P8tV1iNMvN2mRK0yy3c+UjL+bw==
->>>>>>> e1cc6b91948cbc21c00a441e8d481f5764826609
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
     "@eslint-community/regexpp" "^4.4.0"
@@ -4031,17 +3819,10 @@ eslint@*, "eslint@^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8", "eslint@^3 || ^4
     "merge-stream" "^2.0.0"
     "supports-color" "^8.0.0"
 
-<<<<<<< HEAD
 "joi@^17.4.0":
-  "integrity" "sha512-jjdRHb5WtL+KgSHvOULQEPPv4kcl+ixd1ybOFQq3rWLgEEqc03QMmilodL0GVJE14U/SQDXkUhQUSZANGDH/AA=="
-  "resolved" "https://registry.npmmirror.com/joi/-/joi-17.8.4.tgz"
-  "version" "17.8.4"
-=======
-joi@^17.4.0:
-  version "17.9.1"
-  resolved "https://registry.npmmirror.com/joi/-/joi-17.9.1.tgz"
-  integrity sha512-FariIi9j6QODKATGBrEX7HZcja8Bsh3rfdGYy/Sb65sGlZWK/QWesU1ghk7aJWDj95knjXlQfSmzFSPPkLVsfw==
->>>>>>> e1cc6b91948cbc21c00a441e8d481f5764826609
+  "integrity" "sha512-FariIi9j6QODKATGBrEX7HZcja8Bsh3rfdGYy/Sb65sGlZWK/QWesU1ghk7aJWDj95knjXlQfSmzFSPPkLVsfw=="
+  "resolved" "https://registry.npmmirror.com/joi/-/joi-17.9.1.tgz"
+  "version" "17.9.1"
   dependencies:
     "@hapi/hoek" "^9.0.0"
     "@hapi/topo" "^5.0.0"
@@ -4054,17 +3835,10 @@ joi@^17.4.0:
   "resolved" "https://registry.npmmirror.com/js-message/-/js-message-1.0.7.tgz"
   "version" "1.0.7"
 
-<<<<<<< HEAD
 "js-sdsl@^4.1.4":
-  "integrity" "sha512-mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ=="
-  "resolved" "https://registry.npmmirror.com/js-sdsl/-/js-sdsl-4.3.0.tgz"
-  "version" "4.3.0"
-=======
-js-sdsl@^4.1.4:
-  version "4.4.0"
-  resolved "https://registry.npmmirror.com/js-sdsl/-/js-sdsl-4.4.0.tgz"
-  integrity sha512-FfVSdx6pJ41Oa+CF7RDaFmTnCaFhua+SNYQX74riGOpl96x+2jQCqEfQ2bnXu/5DPCqlRuiqyvTJM0Qjz26IVg==
->>>>>>> e1cc6b91948cbc21c00a441e8d481f5764826609
+  "integrity" "sha512-FfVSdx6pJ41Oa+CF7RDaFmTnCaFhua+SNYQX74riGOpl96x+2jQCqEfQ2bnXu/5DPCqlRuiqyvTJM0Qjz26IVg=="
+  "resolved" "https://registry.npmmirror.com/js-sdsl/-/js-sdsl-4.4.0.tgz"
+  "version" "4.4.0"
 
 "js-tokens@^3.0.0 || ^4.0.0", "js-tokens@^4.0.0":
   "integrity" "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
@@ -4522,17 +4296,10 @@ js-sdsl@^4.1.4:
     "object-assign" "^4.0.1"
     "thenify-all" "^1.0.0"
 
-<<<<<<< HEAD
 "nanoid@^3.3.4":
-  "integrity" "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw=="
-  "resolved" "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.4.tgz"
-  "version" "3.3.4"
-=======
-nanoid@^3.3.4:
-  version "3.3.6"
-  resolved "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.6.tgz"
-  integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==
->>>>>>> e1cc6b91948cbc21c00a441e8d481f5764826609
+  "integrity" "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA=="
+  "resolved" "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.6.tgz"
+  "version" "3.3.6"
 
 "natural-compare-lite@^1.4.0":
   "integrity" "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g=="
@@ -5236,15 +5003,9 @@ nanoid@^3.3.4:
   "version" "1.1.2"
 
 "prettier@^1.18.2 || ^2.0.0":
-<<<<<<< HEAD
-  "integrity" "sha512-vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw=="
-  "resolved" "https://registry.npmmirror.com/prettier/-/prettier-2.8.4.tgz"
-  "version" "2.8.4"
-=======
-  version "2.8.7"
-  resolved "https://registry.npmmirror.com/prettier/-/prettier-2.8.7.tgz"
-  integrity sha512-yPngTo3aXUUmyuTjeTUT75txrf+aMh9FiD7q9ZE/i6r0bPb22g4FsE6Y338PQX1bmfy08i9QQCB7/rcUAVntfw==
->>>>>>> e1cc6b91948cbc21c00a441e8d481f5764826609
+  "integrity" "sha512-yPngTo3aXUUmyuTjeTUT75txrf+aMh9FiD7q9ZE/i6r0bPb22g4FsE6Y338PQX1bmfy08i9QQCB7/rcUAVntfw=="
+  "resolved" "https://registry.npmmirror.com/prettier/-/prettier-2.8.7.tgz"
+  "version" "2.8.7"
 
 "pretty-error@^4.0.0":
   "integrity" "sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw=="
@@ -5513,17 +5274,10 @@ nanoid@^3.3.4:
   dependencies:
     "glob" "^7.1.3"
 
-<<<<<<< HEAD
 "rollup@^3.18.0":
-  "integrity" "sha512-lAbrdN7neYCg/8WaoWn/ckzCtz+jr70GFfYdlf50OF7387HTg+wiuiqJRFYawwSPpqfqDNYqK7smY/ks2iAudg=="
-  "resolved" "https://registry.npmmirror.com/rollup/-/rollup-3.19.1.tgz"
-  "version" "3.19.1"
-=======
-rollup@^3.18.0:
-  version "3.20.2"
-  resolved "https://registry.npmmirror.com/rollup/-/rollup-3.20.2.tgz"
-  integrity sha512-3zwkBQl7Ai7MFYQE0y1MeQ15+9jsi7XxfrqwTb/9EK8D9C9+//EBR4M+CuA1KODRaNbFez/lWxA5vhEGZp4MUg==
->>>>>>> e1cc6b91948cbc21c00a441e8d481f5764826609
+  "integrity" "sha512-3zwkBQl7Ai7MFYQE0y1MeQ15+9jsi7XxfrqwTb/9EK8D9C9+//EBR4M+CuA1KODRaNbFez/lWxA5vhEGZp4MUg=="
+  "resolved" "https://registry.npmmirror.com/rollup/-/rollup-3.20.2.tgz"
+  "version" "3.20.2"
   optionalDependencies:
     "fsevents" "~2.3.2"
 
@@ -5575,17 +5329,10 @@ rollup@^3.18.0:
   "resolved" "https://registry.npmmirror.com/safer-buffer/-/safer-buffer-2.1.2.tgz"
   "version" "2.1.2"
 
-<<<<<<< HEAD
 "sass@*", "sass@^1.60.0":
   "integrity" "sha512-updbwW6fNb5gGm8qMXzVO7V4sWf7LMXnMly/JEyfbfERbVH46Fn6q02BX7/eHTdKpE7d+oTkMMQpFWNUMfFbgQ=="
   "resolved" "https://registry.npmmirror.com/sass/-/sass-1.60.0.tgz"
   "version" "1.60.0"
-=======
-sass@*, sass@^1.60.0:
-  version "1.60.0"
-  resolved "https://registry.npmmirror.com/sass/-/sass-1.60.0.tgz"
-  integrity sha512-updbwW6fNb5gGm8qMXzVO7V4sWf7LMXnMly/JEyfbfERbVH46Fn6q02BX7/eHTdKpE7d+oTkMMQpFWNUMfFbgQ==
->>>>>>> e1cc6b91948cbc21c00a441e8d481f5764826609
   dependencies:
     "chokidar" ">=3.0.0 <4.0.0"
     "immutable" "^4.0.0"
@@ -6131,17 +5878,10 @@ sass@*, sass@^1.60.0:
     "serialize-javascript" "^6.0.1"
     "terser" "^5.16.5"
 
-<<<<<<< HEAD
 "terser@^5.10.0", "terser@^5.16.5", "terser@^5.4.0":
-  "integrity" "sha512-IBZ+ZQIA9sMaXmRZCUMDjNH0D5AQQfdn4WUjHL0+1lF4TP1IHRJbrhb6fNaXWikrYQTSkb7SLxkeXAiy1p7mbg=="
-  "resolved" "https://registry.npmmirror.com/terser/-/terser-5.16.6.tgz"
-  "version" "5.16.6"
-=======
-terser@^5.10.0, terser@^5.16.5, terser@^5.4.0:
-  version "5.16.8"
-  resolved "https://registry.npmmirror.com/terser/-/terser-5.16.8.tgz"
-  integrity sha512-QI5g1E/ef7d+PsDifb+a6nnVgC4F22Bg6T0xrBrz6iloVB4PUkkunp6V8nzoOOZJIzjWVdAGqCdlKlhLq/TbIA==
->>>>>>> e1cc6b91948cbc21c00a441e8d481f5764826609
+  "integrity" "sha512-QI5g1E/ef7d+PsDifb+a6nnVgC4F22Bg6T0xrBrz6iloVB4PUkkunp6V8nzoOOZJIzjWVdAGqCdlKlhLq/TbIA=="
+  "resolved" "https://registry.npmmirror.com/terser/-/terser-5.16.8.tgz"
+  "version" "5.16.8"
   dependencies:
     "@jridgewell/source-map" "^0.3.2"
     "acorn" "^8.5.0"
@@ -6305,17 +6045,10 @@ terser@^5.10.0, terser@^5.16.5, terser@^5.4.0:
     "for-each" "^0.3.3"
     "is-typed-array" "^1.1.9"
 
-<<<<<<< HEAD
 "typescript@*", "typescript@^5.0.2", "typescript@>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta":
   "integrity" "sha512-wVORMBGO/FAs/++blGNeAVdbNKtIh1rbBL2EyQ1+J9lClJ93KiiKe8PmFIVdXhHcyv44SL9oglmfeSsndo0jRw=="
   "resolved" "https://registry.npmmirror.com/typescript/-/typescript-5.0.2.tgz"
   "version" "5.0.2"
-=======
-typescript@*, typescript@^5.0.2, "typescript@>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta":
-  version "5.0.2"
-  resolved "https://registry.npmmirror.com/typescript/-/typescript-5.0.2.tgz"
-  integrity sha512-wVORMBGO/FAs/++blGNeAVdbNKtIh1rbBL2EyQ1+J9lClJ93KiiKe8PmFIVdXhHcyv44SL9oglmfeSsndo0jRw==
->>>>>>> e1cc6b91948cbc21c00a441e8d481f5764826609
 
 "unbox-primitive@^1.0.2":
   "integrity" "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw=="
@@ -6390,17 +6123,10 @@ typescript@*, typescript@^5.0.2, "typescript@>=2.8.0 || >= 3.2.0-dev || >= 3.3.0
   "resolved" "https://registry.npmmirror.com/vary/-/vary-1.1.2.tgz"
   "version" "1.1.2"
 
-<<<<<<< HEAD
 "vite@^4.0.0", "vite@^4.2.1":
   "integrity" "sha512-7MKhqdy0ISo4wnvwtqZkjke6XN4taqQ2TBaTccLIpOKv7Vp2h4Y+NpmWCnGDeSvvn45KxvWgGyb0MkHvY1vgbg=="
   "resolved" "https://registry.npmmirror.com/vite/-/vite-4.2.1.tgz"
   "version" "4.2.1"
-=======
-vite@^4.0.0, vite@^4.2.1:
-  version "4.2.1"
-  resolved "https://registry.npmmirror.com/vite/-/vite-4.2.1.tgz"
-  integrity sha512-7MKhqdy0ISo4wnvwtqZkjke6XN4taqQ2TBaTccLIpOKv7Vp2h4Y+NpmWCnGDeSvvn45KxvWgGyb0MkHvY1vgbg==
->>>>>>> e1cc6b91948cbc21c00a441e8d481f5764826609
   dependencies:
     "esbuild" "^0.17.5"
     "postcss" "^8.4.21"
@@ -6461,17 +6187,10 @@ vite@^4.0.0, vite@^4.2.1:
   "resolved" "https://registry.npmmirror.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz"
   "version" "1.9.1"
 
-<<<<<<< HEAD
 "vue@^3.0.0-0 || ^2.6.0", "vue@^3.2.0", "vue@^3.2.25", "vue@^3.2.47", "vue@3.2.47":
   "integrity" "sha512-60188y/9Dc9WVrAZeUVSDxRQOZ+z+y5nO2ts9jWXSTkMvayiWxCWOWtBQoYjLeccfXkiiPZWAHcV+WTPhkqJHQ=="
   "resolved" "https://registry.npmmirror.com/vue/-/vue-3.2.47.tgz"
   "version" "3.2.47"
-=======
-"vue@^3.0.0-0 || ^2.6.0", vue@^3.2.0, vue@^3.2.25, vue@^3.2.47, vue@3.2.47:
-  version "3.2.47"
-  resolved "https://registry.npmmirror.com/vue/-/vue-3.2.47.tgz"
-  integrity sha512-60188y/9Dc9WVrAZeUVSDxRQOZ+z+y5nO2ts9jWXSTkMvayiWxCWOWtBQoYjLeccfXkiiPZWAHcV+WTPhkqJHQ==
->>>>>>> e1cc6b91948cbc21c00a441e8d481f5764826609
   dependencies:
     "@vue/compiler-dom" "3.2.47"
     "@vue/compiler-sfc" "3.2.47"
@@ -6548,17 +6267,10 @@ vite@^4.0.0, vite@^4.2.1:
     "range-parser" "^1.2.1"
     "schema-utils" "^4.0.0"
 
-<<<<<<< HEAD
 "webpack-dev-server@^4.7.3":
-  "integrity" "sha512-XRN9YRnvOj3TQQ5w/0pR1y1xDcVnbWtNkTri46kuEbaWUPTHsWUvOyAAI7PZHLY+hsFki2kRltJjKMw7e+IiqA=="
-  "resolved" "https://registry.npmmirror.com/webpack-dev-server/-/webpack-dev-server-4.12.0.tgz"
-  "version" "4.12.0"
-=======
-webpack-dev-server@^4.7.3:
-  version "4.13.1"
-  resolved "https://registry.npmmirror.com/webpack-dev-server/-/webpack-dev-server-4.13.1.tgz"
-  integrity sha512-5tWg00bnWbYgkN+pd5yISQKDejRBYGEw15RaEEslH+zdbNDxxaZvEAO2WulaSaFKb5n3YG8JXsGaDsut1D0xdA==
->>>>>>> e1cc6b91948cbc21c00a441e8d481f5764826609
+  "integrity" "sha512-5tWg00bnWbYgkN+pd5yISQKDejRBYGEw15RaEEslH+zdbNDxxaZvEAO2WulaSaFKb5n3YG8JXsGaDsut1D0xdA=="
+  "resolved" "https://registry.npmmirror.com/webpack-dev-server/-/webpack-dev-server-4.13.1.tgz"
+  "version" "4.13.1"
   dependencies:
     "@types/bonjour" "^3.5.9"
     "@types/connect-history-api-fallback" "^1.3.5"
@@ -6609,17 +6321,10 @@ webpack-dev-server@^4.7.3:
   "resolved" "https://registry.npmmirror.com/webpack-virtual-modules/-/webpack-virtual-modules-0.4.6.tgz"
   "version" "0.4.6"
 
-<<<<<<< HEAD
 "webpack@^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.0.0", "webpack@^3.0.0 || ^4.1.0 || ^5.0.0-0", "webpack@^4.0.0 || ^5.0.0", "webpack@^4.1.0 || ^5.0.0-0", "webpack@^4.27.0 || ^5.0.0", "webpack@^4.37.0 || ^5.0.0", "webpack@^5.0.0", "webpack@^5.1.0", "webpack@^5.20.0", "webpack@^5.54.0":
-  "integrity" "sha512-Th05ggRm23rVzEOlX8y67NkYCHa9nTNcwHPBhdg+lKG+mtiW7XgggjAeeLnADAe7mLjJ6LUNfgHAuRRh+Z6J7w=="
-  "resolved" "https://registry.npmmirror.com/webpack/-/webpack-5.76.2.tgz"
-  "version" "5.76.2"
-=======
-"webpack@^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.0.0", "webpack@^3.0.0 || ^4.1.0 || ^5.0.0-0", "webpack@^4.0.0 || ^5.0.0", "webpack@^4.1.0 || ^5.0.0-0", "webpack@^4.27.0 || ^5.0.0", "webpack@^4.37.0 || ^5.0.0", webpack@^5.0.0, webpack@^5.1.0, webpack@^5.20.0, webpack@^5.54.0:
-  version "5.76.3"
-  resolved "https://registry.npmmirror.com/webpack/-/webpack-5.76.3.tgz"
-  integrity sha512-18Qv7uGPU8b2vqGeEEObnfICyw2g39CHlDEK4I7NK13LOur1d0HGmGNKGT58Eluwddpn3oEejwvBPoP4M7/KSA==
->>>>>>> e1cc6b91948cbc21c00a441e8d481f5764826609
+  "integrity" "sha512-18Qv7uGPU8b2vqGeEEObnfICyw2g39CHlDEK4I7NK13LOur1d0HGmGNKGT58Eluwddpn3oEejwvBPoP4M7/KSA=="
+  "resolved" "https://registry.npmmirror.com/webpack/-/webpack-5.76.3.tgz"
+  "version" "5.76.3"
   dependencies:
     "@types/eslint-scope" "^3.7.3"
     "@types/estree" "^0.0.51"
@@ -6822,16 +6527,9 @@ webpack-dev-server@^4.7.3:
     "normalize-path" "^1.0.0"
     "strip-indent" "^2.0.0"
 
-<<<<<<< HEAD
 "zrender@5.4.3":
   "integrity" "sha512-DRUM4ZLnoaT0PBVvGBDO9oWIDBKFdAVieNWxWwK0niYzJCMwGchRk21/hsE+RKkIveH3XHCyvXcJDkgLVvfizQ=="
   "resolved" "https://registry.npmmirror.com/zrender/-/zrender-5.4.3.tgz"
   "version" "5.4.3"
-=======
-zrender@5.4.3:
-  version "5.4.3"
-  resolved "https://registry.npmmirror.com/zrender/-/zrender-5.4.3.tgz"
-  integrity sha512-DRUM4ZLnoaT0PBVvGBDO9oWIDBKFdAVieNWxWwK0niYzJCMwGchRk21/hsE+RKkIveH3XHCyvXcJDkgLVvfizQ==
->>>>>>> e1cc6b91948cbc21c00a441e8d481f5764826609
   dependencies:
     "tslib" "2.3.0"