diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 3effecc..69f5c09 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -29,7 +29,8 @@
 		"coenraads.bracket-pair-colorizer",
 		"aaron-bond.better-comments",
 		"msjsdiag.debugger-for-chrome",
-		"smcpeak.default-keys-windows"
+		"smcpeak.default-keys-windows",
+		"vscode-icons-team.vscode-icons"
 	],
 
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ccbc151..3256421 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,6 +1,6 @@
   
 name: Dev Publish
-on: 
+on:
   push:
     branches:
       - main
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0263214..893ce74 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,5 @@
-# This file is a template, and might need editing before it works on your project.
 default:
-  image: node:latest
-
-  # Validate that the repository contains a package.json and extract a few values from it.
+  image: node:current-buster
   before_script:
     - |
       if [[ ! -f package.json ]]; then
@@ -13,48 +10,10 @@ default:
     - NPM_PACKAGE_NAME=$(node -p "require('./package.json').name")
     - NPM_PACKAGE_VERSION=$(node -p "require('./package.json').version")
 
-# Validate that the package name is properly scoped to the project's root namespace.
-# For more information, see https://docs.gitlab.com/ee/user/packages/npm_registry/#package-naming-convention
-validate_package_scope:
-  stage: build
+test_package:
+  stage: test
   script:
     - |
-      if [[ ! $NPM_PACKAGE_NAME =~ ^@$CI_PROJECT_ROOT_NAMESPACE/ ]]; then
-        echo "Invalid package scope! Packages must be scoped in the root namespace of the project, e.g. \"@${CI_PROJECT_ROOT_NAMESPACE}/${CI_PROJECT_NAME}\""
-        echo 'For more information, see https://docs.gitlab.com/ee/user/packages/npm_registry/#package-naming-convention'
-        exit 1
-      fi
-
-# If no .npmrc if included in the repo, generate a temporary one to use during the publish step
-# that is configured to publish to GitLab's NPM registry
-create_npmrc:
-  stage: build
-  script:
-    - |
-      if [[ ! -f .npmrc ]]; then
-        echo 'No .npmrc found! Creating one now. Please review the following link for more information: https://docs.gitlab.com/ee/user/packages/npm_registry/index.html#authenticating-with-a-ci-job-token'
-
-        {
-          echo '@${CI_PROJECT_ROOT_NAMESPACE}:registry=${CI_SERVER_PROTOCOL}://${CI_SERVER_HOST}:${CI_SERVER_PORT}/api/v4/projects/${CI_PROJECT_ID}/packages/npm/'
-          echo '//${CI_SERVER_HOST}:${CI_SERVER_PORT}/api/v4/packages/npm/:_authToken=${CI_JOB_TOKEN}'
-          echo '//${CI_SERVER_HOST}:${CI_SERVER_PORT}/api/v4/projects/${CI_PROJECT_ID}/packages/npm/:_authToken=${CI_JOB_TOKEN}'
-        } >> .npmrc
-
-      fi
-  artifacts:
-    paths:
-      - .npmrc
-
-# Publish the package. If the version in package.json has not yet been published, it will be
-# published to GitLab's NPM registry. If the version already exists, the publish command
-# will fail and the existing package will not be updated.
-publish_package:
-  stage: deploy
-  script:
-    - |
-      {
-        npm publish &&
-        echo "Successfully published version ${NPM_PACKAGE_VERSION} of ${NPM_PACKAGE_NAME} to GitLab's NPM registry: ${CI_PROJECT_URL}/-/packages"
-      } || {
-        echo "No new version of ${NPM_PACKAGE_NAME} published. This is most likely because version ${NPM_PACKAGE_VERSION} already exists in GitLab's NPM registry."
-      }
+      npm install -f
+      npm update
+      npm run test
diff --git a/package-lock.json b/package-lock.json
index 6effd59..85815e4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,21 +1,15 @@
 {
-<<<<<<< HEAD
-  "name": "bds_maneger_api",
-  "version": "1.3.0",
-=======
+
   "name": "@the-bds-maneger/bds_maneger_api",
   "version": "1.5.4",
->>>>>>> main
+  "lockfileVersion": 1,
+  "requires": true,
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
-<<<<<<< HEAD
-      "version": "1.3.0",
-=======
       "name": "@the-bds-maneger/bds_maneger_api",
       "version": "1.5.4",
->>>>>>> main
       "license": "AGPL-3.0-or-later",
       "dependencies": {
         "adm-zip": "^0.5.1",
@@ -32,13 +26,6 @@
         "properties-to-json": "^0.1.7",
         "qr-image": "^3.2.0",
         "qrcode": "^1.4.4",
-<<<<<<< HEAD
-        "shelljs": "^0.8.4",
-        "systeminformation": "^5.0.2",
-        "telegraf": "^4.0.0"
-      }
-    },
-=======
         "request-ip": "^2.1.3",
         "shelljs": "^0.8.4",
         "systeminformation": "^5.0.10",
@@ -207,8 +194,6 @@
         "node": ">= 0.6"
       }
     },
-<<<<<<< HEAD
-=======
     "node_modules/acorn": {
       "version": "7.4.1",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
@@ -230,7 +215,6 @@
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
     },
->>>>>>> main
     "node_modules/adm-zip": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.2.tgz",
@@ -259,14 +243,11 @@
       },
       "engines": {
         "node": ">=6.0"
-<<<<<<< HEAD
-=======
       },
       "peerDependenciesMeta": {
         "supports-color": {
           "optional": true
         }
->>>>>>> main
       }
     },
     "node_modules/agent-base/node_modules/ms": {
@@ -274,12 +255,6 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
-<<<<<<< HEAD
-    "node_modules/ansi-regex": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-      "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-=======
     "node_modules/ajv": {
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
@@ -301,22 +276,10 @@
       "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
       "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==",
       "dev": true,
->>>>>>> main
       "engines": {
         "node": ">=6"
       }
     },
-<<<<<<< HEAD
-    "node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-=======
     "node_modules/ansi-regex": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
@@ -348,7 +311,6 @@
       "dev": true,
       "dependencies": {
         "sprintf-js": "~1.0.2"
->>>>>>> main
       }
     },
     "node_modules/array-flatten": {
@@ -364,8 +326,6 @@
         "node": ">=8"
       }
     },
-<<<<<<< HEAD
-=======
     "node_modules/astral-regex": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
@@ -375,7 +335,6 @@
         "node": ">=8"
       }
     },
->>>>>>> main
     "node_modules/balanced-match": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
@@ -384,9 +343,6 @@
     "node_modules/base64-js": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-<<<<<<< HEAD
-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
-=======
       "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
       "funding": [
         {
@@ -402,7 +358,6 @@
           "url": "https://feross.org/support"
         }
       ]
->>>>>>> main
     },
     "node_modules/bignumber.js": {
       "version": "9.0.1",
@@ -445,8 +400,6 @@
       "version": "5.7.1",
       "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
       "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-<<<<<<< HEAD
-=======
       "funding": [
         {
           "type": "github",
@@ -461,7 +414,6 @@
           "url": "https://feross.org/support"
         }
       ],
->>>>>>> main
       "dependencies": {
         "base64-js": "^1.3.1",
         "ieee754": "^1.1.13"
@@ -504,8 +456,6 @@
         "node": ">= 0.8"
       }
     },
-<<<<<<< HEAD
-=======
     "node_modules/callsites": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
@@ -515,7 +465,6 @@
         "node": ">=6"
       }
     },
->>>>>>> main
     "node_modules/camelcase": {
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
@@ -524,8 +473,6 @@
         "node": ">=6"
       }
     },
-<<<<<<< HEAD
-=======
     "node_modules/chalk": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
@@ -542,7 +489,6 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
->>>>>>> main
     "node_modules/cliui": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
@@ -553,20 +499,6 @@
         "wrap-ansi": "^5.1.0"
       }
     },
-<<<<<<< HEAD
-    "node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
-=======
     "node_modules/cliui/node_modules/ansi-regex": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
@@ -629,7 +561,6 @@
       "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
->>>>>>> main
     },
     "node_modules/command-exists": {
       "version": "1.2.9",
@@ -685,12 +616,6 @@
         "node": ">= 0.10"
       }
     },
-<<<<<<< HEAD
-    "node_modules/crypto": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/crypto/-/crypto-1.0.1.tgz",
-      "integrity": "sha512-VxBKmeNcqQdiUQUW2Tzq0t377b54N2bMtXO/qiLa+6eRRmmC4qT3D4OnTGoT/U6O9aklQ/jTwbOtRMTTY8G0Ig=="
-=======
     "node_modules/cross-spawn": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
@@ -710,7 +635,6 @@
       "resolved": "https://registry.npmjs.org/crypto/-/crypto-1.0.1.tgz",
       "integrity": "sha512-VxBKmeNcqQdiUQUW2Tzq0t377b54N2bMtXO/qiLa+6eRRmmC4qT3D4OnTGoT/U6O9aklQ/jTwbOtRMTTY8G0Ig==",
       "deprecated": "This package is no longer supported. It's now a built-in Node module. If you've depended on crypto, you should switch to the one that's built-in."
->>>>>>> main
     },
     "node_modules/debug": {
       "version": "2.6.9",
@@ -728,15 +652,12 @@
         "node": ">=0.10.0"
       }
     },
-<<<<<<< HEAD
-=======
     "node_modules/deep-is": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
       "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
       "dev": true
     },
->>>>>>> main
     "node_modules/depd": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
@@ -755,8 +676,6 @@
       "resolved": "https://registry.npmjs.org/dijkstrajs/-/dijkstrajs-1.0.1.tgz",
       "integrity": "sha1-082BIh4+pAdCz83lVtTpnpjdxxs="
     },
-<<<<<<< HEAD
-=======
     "node_modules/doctrine": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
@@ -769,7 +688,6 @@
         "node": ">=6.0.0"
       }
     },
->>>>>>> main
     "node_modules/ecdsa-sig-formatter": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
@@ -784,16 +702,10 @@
       "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
     },
     "node_modules/emoji-regex": {
-<<<<<<< HEAD
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
-=======
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
       "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
       "dev": true
->>>>>>> main
     },
     "node_modules/encodeurl": {
       "version": "1.0.2",
@@ -803,8 +715,6 @@
         "node": ">= 0.8"
       }
     },
-<<<<<<< HEAD
-=======
     "node_modules/enquirer": {
       "version": "2.3.6",
       "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
@@ -817,14 +727,11 @@
         "node": ">=8.6"
       }
     },
->>>>>>> main
     "node_modules/escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
       "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
     },
-<<<<<<< HEAD
-=======
     "node_modules/escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
@@ -1053,7 +960,6 @@
         "node": ">=0.10.0"
       }
     },
->>>>>>> main
     "node_modules/etag": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
@@ -1111,23 +1017,15 @@
       }
     },
     "node_modules/express-rate-limit": {
-<<<<<<< HEAD
-      "version": "5.2.3",
-      "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-5.2.3.tgz",
-      "integrity": "sha512-cjQH+oDrEPXxc569XvxhHC6QXqJiuBT6BhZ70X3bdAImcnHnTNMVuMAJaT0TXPoRiEErUrVPRcOTpZpM36VbOQ=="
-=======
       "version": "5.2.5",
       "resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-5.2.5.tgz",
       "integrity": "sha512-fv9mf4hWRKZHVlY8ChVNYnGxa49m0zQ6CrJxNiXe2IjJPqicrqoA/JOyBbvs4ufSSLZ6NTzhtgEyLcdfbe+Q6Q=="
->>>>>>> main
     },
     "node_modules/extend": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
       "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
     },
-<<<<<<< HEAD
-=======
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -1146,14 +1044,11 @@
       "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
       "dev": true
     },
->>>>>>> main
     "node_modules/fast-text-encoding": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.3.tgz",
       "integrity": "sha512-dtm4QZH9nZtcDt8qJiOH9fcQd1NAgi+K1O2DbE6GG1PPCK/BWfOH3idCTRQ4ImXRUOyopDEgDEnVEE7Y/2Wrig=="
     },
-<<<<<<< HEAD
-=======
     "node_modules/file-entry-cache": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.0.tgz",
@@ -1166,7 +1061,6 @@
         "node": "^10.12.0 || >=12.0.0"
       }
     },
->>>>>>> main
     "node_modules/finalhandler": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
@@ -1195,8 +1089,6 @@
         "node": ">=6"
       }
     },
-<<<<<<< HEAD
-=======
     "node_modules/flat-cache": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz",
@@ -1216,7 +1108,6 @@
       "integrity": "sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==",
       "dev": true
     },
->>>>>>> main
     "node_modules/forwarded": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
@@ -1243,15 +1134,12 @@
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
       "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
     },
-<<<<<<< HEAD
-=======
     "node_modules/functional-red-black-tree": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
       "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
       "dev": true
     },
->>>>>>> main
     "node_modules/gaxios": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-4.1.0.tgz",
@@ -1301,14 +1189,6 @@
       },
       "engines": {
         "node": "*"
-<<<<<<< HEAD
-      }
-    },
-    "node_modules/google-auth-library": {
-      "version": "6.1.4",
-      "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-6.1.4.tgz",
-      "integrity": "sha512-q0kYtGWnDd9XquwiQGAZeI2Jnglk7NDi0cChE4tWp6Kpo/kbqnt9scJb0HP+/xqt03Beqw/xQah1OPrci+pOxw==",
-=======
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
@@ -1345,7 +1225,6 @@
       "version": "6.1.6",
       "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-6.1.6.tgz",
       "integrity": "sha512-Q+ZjUEvLQj/lrVHF/IQwRo6p3s8Nc44Zk/DALsN+ac3T4HY/g/3rrufkgtl+nZ1TW7DNAw5cTChdVp4apUXVgQ==",
->>>>>>> main
       "dependencies": {
         "arrify": "^2.0.0",
         "base64-js": "^1.3.0",
@@ -1404,21 +1283,6 @@
       }
     },
     "node_modules/graceful-fs": {
-<<<<<<< HEAD
-      "version": "4.2.4",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
-      "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="
-    },
-    "node_modules/gtoken": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-5.2.0.tgz",
-      "integrity": "sha512-qbf6JWEYFMj3WMAluvYXl8GAiji6w8d9OmAGCbBg0xF4xD/yu6ZaO6BhoXNddRjKcOUpZD81iea1H5B45gAo1g==",
-      "dependencies": {
-        "gaxios": "^4.0.0",
-        "google-p12-pem": "^3.0.3",
-        "jws": "^4.0.0",
-        "mime": "^2.2.0"
-=======
       "version": "4.2.6",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz",
       "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ=="
@@ -1431,7 +1295,6 @@
         "gaxios": "^4.0.0",
         "google-p12-pem": "^3.0.3",
         "jws": "^4.0.0"
->>>>>>> main
       },
       "engines": {
         "node": ">=10"
@@ -1448,8 +1311,6 @@
         "node": ">= 0.4.0"
       }
     },
-<<<<<<< HEAD
-=======
     "node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -1459,7 +1320,6 @@
         "node": ">=8"
       }
     },
->>>>>>> main
     "node_modules/http-errors": {
       "version": "1.7.2",
       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
@@ -1496,14 +1356,11 @@
       },
       "engines": {
         "node": ">=6.0"
-<<<<<<< HEAD
-=======
       },
       "peerDependenciesMeta": {
         "supports-color": {
           "optional": true
         }
->>>>>>> main
       }
     },
     "node_modules/https-proxy-agent/node_modules/ms": {
@@ -1525,9 +1382,6 @@
     "node_modules/ieee754": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-<<<<<<< HEAD
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
-=======
       "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
       "funding": [
         {
@@ -1568,7 +1422,6 @@
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
->>>>>>> main
     },
     "node_modules/imurmurhash": {
       "version": "0.1.4",
@@ -1608,26 +1461,20 @@
         "node": ">= 0.10"
       }
     },
-<<<<<<< HEAD
-=======
     "node_modules/is_js": {
       "version": "0.9.0",
       "resolved": "https://registry.npmjs.org/is_js/-/is_js-0.9.0.tgz",
       "integrity": "sha1-CrlFQFArp6+iTIVqqYVWFmnpxS0="
     },
->>>>>>> main
     "node_modules/is-core-module": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz",
       "integrity": "sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==",
       "dependencies": {
         "has": "^1.0.3"
-<<<<<<< HEAD
-=======
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
->>>>>>> main
       }
     },
     "node_modules/is-docker": {
@@ -1639,16 +1486,6 @@
       },
       "engines": {
         "node": ">=8"
-<<<<<<< HEAD
-      }
-    },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-      "engines": {
-        "node": ">=4"
-=======
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -1682,7 +1519,6 @@
       },
       "engines": {
         "node": ">=0.10.0"
->>>>>>> main
       }
     },
     "node_modules/is-stream": {
@@ -1709,8 +1545,6 @@
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
       "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="
     },
-<<<<<<< HEAD
-=======
     "node_modules/isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
@@ -1736,7 +1570,6 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
->>>>>>> main
     "node_modules/json-bigint": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz",
@@ -1745,8 +1578,6 @@
         "bignumber.js": "^9.0.0"
       }
     },
-<<<<<<< HEAD
-=======
     "node_modules/json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
@@ -1759,7 +1590,6 @@
       "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
       "dev": true
     },
->>>>>>> main
     "node_modules/jwa": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz",
@@ -1779,8 +1609,6 @@
         "safe-buffer": "^5.0.1"
       }
     },
-<<<<<<< HEAD
-=======
     "node_modules/levn": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
@@ -1794,7 +1622,6 @@
         "node": ">= 0.8.0"
       }
     },
->>>>>>> main
     "node_modules/locate-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
@@ -1807,15 +1634,12 @@
         "node": ">=6"
       }
     },
-<<<<<<< HEAD
-=======
     "node_modules/lodash": {
       "version": "4.17.20",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
       "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
       "dev": true
     },
->>>>>>> main
     "node_modules/lru-cache": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
@@ -1849,24 +1673,14 @@
       }
     },
     "node_modules/mime": {
-<<<<<<< HEAD
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.0.tgz",
-      "integrity": "sha512-ft3WayFSFUVBuJj7BMLKAQcSlItKtfjsKDDsii3rqFDAZ7t11zRe8ASw/GlmivGwVUYtwkQrxiGGpL6gFvB0ag==",
-=======
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
       "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
->>>>>>> main
       "bin": {
         "mime": "cli.js"
       },
       "engines": {
-<<<<<<< HEAD
-        "node": ">=4.0.0"
-=======
         "node": ">=4"
->>>>>>> main
       }
     },
     "node_modules/mime-db": {
@@ -1914,15 +1728,12 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
     },
-<<<<<<< HEAD
-=======
     "node_modules/natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
       "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
       "dev": true
     },
->>>>>>> main
     "node_modules/negotiator": {
       "version": "0.6.2",
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
@@ -1986,23 +1797,12 @@
       }
     },
     "node_modules/open": {
-<<<<<<< HEAD
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/open/-/open-7.3.1.tgz",
-      "integrity": "sha512-f2wt9DCBKKjlFbjzGb8MOAW8LH8F0mrs1zc7KTjAJ9PZNQbfenzWbNP1VZJvw6ICMG9r14Ah6yfwPn7T7i646A==",
-=======
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/open/-/open-7.4.0.tgz",
-      "integrity": "sha512-PGoBCX/lclIWlpS/R2PQuIR4NJoXh6X5AwVzE7WXnWRGvHg7+4TBCgsujUgiPpm0K1y4qvQeWnCWVTpTKZBtvA==",
->>>>>>> main
       "dependencies": {
         "is-docker": "^2.0.0",
         "is-wsl": "^2.1.1"
       },
       "engines": {
         "node": ">=8"
-<<<<<<< HEAD
-=======
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -2023,7 +1823,6 @@
       },
       "engines": {
         "node": ">= 0.8.0"
->>>>>>> main
       }
     },
     "node_modules/p-limit": {
@@ -2035,12 +1834,9 @@
       },
       "engines": {
         "node": ">=6"
-<<<<<<< HEAD
-=======
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
->>>>>>> main
       }
     },
     "node_modules/p-locate": {
@@ -2070,8 +1866,6 @@
         "node": ">=6"
       }
     },
-<<<<<<< HEAD
-=======
     "node_modules/parent-module": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
@@ -2084,7 +1878,6 @@
         "node": ">=6"
       }
     },
->>>>>>> main
     "node_modules/parseurl": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
@@ -2106,9 +1899,6 @@
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
       "engines": {
-<<<<<<< HEAD
-        "node": ">=0.10.0"
-=======
         "node": ">=0.10.0"
       }
     },
@@ -2119,7 +1909,6 @@
       "dev": true,
       "engines": {
         "node": ">=8"
->>>>>>> main
       }
     },
     "node_modules/path-parse": {
@@ -2140,8 +1929,6 @@
         "node": ">=4.0.0"
       }
     },
-<<<<<<< HEAD
-=======
     "node_modules/prelude-ls": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
@@ -2160,7 +1947,6 @@
         "node": ">=0.4.0"
       }
     },
->>>>>>> main
     "node_modules/properties-to-json": {
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/properties-to-json/-/properties-to-json-0.1.7.tgz",
@@ -2178,8 +1964,6 @@
         "node": ">= 0.10"
       }
     },
-<<<<<<< HEAD
-=======
     "node_modules/punycode": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
@@ -2189,7 +1973,6 @@
         "node": ">=6"
       }
     },
->>>>>>> main
     "node_modules/qr-image": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/qr-image/-/qr-image-3.2.0.tgz",
@@ -2256,8 +2039,6 @@
         "node": ">= 0.10"
       }
     },
-<<<<<<< HEAD
-=======
     "node_modules/regexpp": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz",
@@ -2278,7 +2059,6 @@
         "is_js": "^0.9.0"
       }
     },
->>>>>>> main
     "node_modules/require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -2287,8 +2067,6 @@
         "node": ">=0.10.0"
       }
     },
-<<<<<<< HEAD
-=======
     "node_modules/require-from-string": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
@@ -2298,21 +2076,12 @@
         "node": ">=0.10.0"
       }
     },
->>>>>>> main
     "node_modules/require-main-filename": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
       "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="
     },
     "node_modules/resolve": {
-<<<<<<< HEAD
-      "version": "1.19.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz",
-      "integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==",
-      "dependencies": {
-        "is-core-module": "^2.1.0",
-        "path-parse": "^1.0.6"
-=======
       "version": "1.20.0",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
       "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
@@ -2346,7 +2115,6 @@
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
->>>>>>> main
       }
     },
     "node_modules/safe-buffer": {
@@ -2367,8 +2135,6 @@
         "node": ">= 0.10"
       }
     },
-<<<<<<< HEAD
-=======
     "node_modules/semver": {
       "version": "7.3.4",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
@@ -2384,7 +2150,6 @@
         "node": ">=10"
       }
     },
->>>>>>> main
     "node_modules/send": {
       "version": "0.17.1",
       "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
@@ -2408,20 +2173,6 @@
         "node": ">= 0.8.0"
       }
     },
-<<<<<<< HEAD
-    "node_modules/send/node_modules/mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-      "bin": {
-        "mime": "cli.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-=======
->>>>>>> main
     "node_modules/send/node_modules/ms": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
@@ -2451,8 +2202,6 @@
       "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
       "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="
     },
-<<<<<<< HEAD
-=======
     "node_modules/shebang-command": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -2474,7 +2223,6 @@
         "node": ">=8"
       }
     },
->>>>>>> main
     "node_modules/shelljs": {
       "version": "0.8.4",
       "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.4.tgz",
@@ -2491,8 +2239,6 @@
         "node": ">=4"
       }
     },
-<<<<<<< HEAD
-=======
     "node_modules/slice-ansi": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
@@ -2510,7 +2256,6 @@
         "url": "https://github.com/chalk/slice-ansi?sponsor=1"
       }
     },
->>>>>>> main
     "node_modules/slide": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz",
@@ -2519,15 +2264,12 @@
         "node": "*"
       }
     },
-<<<<<<< HEAD
-=======
     "node_modules/sprintf-js": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
       "dev": true
     },
->>>>>>> main
     "node_modules/statuses": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
@@ -2537,35 +2279,6 @@
       }
     },
     "node_modules/string-width": {
-<<<<<<< HEAD
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-      "dependencies": {
-        "emoji-regex": "^7.0.1",
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "dependencies": {
-        "ansi-regex": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/systeminformation": {
-      "version": "5.0.6",
-      "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.0.6.tgz",
-      "integrity": "sha512-sX8I5SPunheS99VYBk1UGzavNMBGTizccaKcYo6TrjPaHF98iFeirexNX99zyGujlNWTVCHiVxzoNdix77hkVw==",
-=======
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
       "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
@@ -2619,7 +2332,6 @@
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.3.0.tgz",
       "integrity": "sha512-pNvwU7Oray7xNkS+WOH+FE8Aks8BQ2sV8zwUiZQq97C3Co7oJVnOrgvAJwSwRlIdQTIBbe+0HZLaRrY8pdXsVw==",
->>>>>>> main
       "os": [
         "darwin",
         "linux",
@@ -2634,14 +2346,6 @@
       },
       "engines": {
         "node": ">=4.0.0"
-<<<<<<< HEAD
-      }
-    },
-    "node_modules/telegraf": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/telegraf/-/telegraf-4.0.2.tgz",
-      "integrity": "sha512-MTo8b6P/MMb6RbqDGXNWpCXESTihxRpTThOIPAfVBJohYQtywYl/vldjqUCdIYdg+ge8Sn/gk+OXfqHg4LewnA==",
-=======
       },
       "funding": {
         "type": "Buy me a coffee",
@@ -2689,7 +2393,6 @@
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/telegraf/-/telegraf-4.0.3.tgz",
       "integrity": "sha512-QWn9r7IAX4C0kHiP2skieI4pry1SO3YGe2n34a3ymqENeu6bJposut6uR1zLNzOhSPvAxqdlO59bJWGXnADqHQ==",
->>>>>>> main
       "dependencies": {
         "abort-controller": "^3.0.0",
         "debug": "^4.3.1",
@@ -2716,14 +2419,11 @@
       },
       "engines": {
         "node": ">=6.0"
-<<<<<<< HEAD
-=======
       },
       "peerDependenciesMeta": {
         "supports-color": {
           "optional": true
         }
->>>>>>> main
       }
     },
     "node_modules/telegraf/node_modules/ms": {
@@ -2731,15 +2431,12 @@
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
-<<<<<<< HEAD
-=======
     "node_modules/text-table": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
       "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
       "dev": true
     },
->>>>>>> main
     "node_modules/toidentifier": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
@@ -2748,8 +2445,6 @@
         "node": ">=0.6"
       }
     },
-<<<<<<< HEAD
-=======
     "node_modules/type-check": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -2771,7 +2466,6 @@
         "node": ">=8"
       }
     },
->>>>>>> main
     "node_modules/type-is": {
       "version": "1.6.18",
       "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
@@ -2785,15 +2479,9 @@
       }
     },
     "node_modules/typegram": {
-<<<<<<< HEAD
-      "version": "3.1.8",
-      "resolved": "https://registry.npmjs.org/typegram/-/typegram-3.1.8.tgz",
-      "integrity": "sha512-2JiSSpgRjpVUMVFvU+hSs6++HvPiR5FJg91L4a62OGeo/hPv0ecAYMAmcnIsKjVJFzOK26qkkKaACVm9Fd+B4g=="
-=======
       "version": "3.1.9",
       "resolved": "https://registry.npmjs.org/typegram/-/typegram-3.1.9.tgz",
       "integrity": "sha512-qF1cR8W7pm9oohLYPwH8jPZY3dRgA3/jjx0O83sKYHg1RYxIO90oEKH5FmnMq0lhGtX75pH0XOtyIU5e7hve4Q=="
->>>>>>> main
     },
     "node_modules/unpipe": {
       "version": "1.0.0",
@@ -2803,8 +2491,6 @@
         "node": ">= 0.8"
       }
     },
-<<<<<<< HEAD
-=======
     "node_modules/uri-js": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
@@ -2814,7 +2500,6 @@
         "punycode": "^2.1.0"
       }
     },
->>>>>>> main
     "node_modules/url-template": {
       "version": "2.0.8",
       "resolved": "https://registry.npmjs.org/url-template/-/url-template-2.0.8.tgz",
@@ -2836,15 +2521,12 @@
         "uuid": "dist/bin/uuid"
       }
     },
-<<<<<<< HEAD
-=======
     "node_modules/v8-compile-cache": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz",
       "integrity": "sha512-gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q==",
       "dev": true
     },
->>>>>>> main
     "node_modules/vary": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
@@ -2853,8 +2535,6 @@
         "node": ">= 0.8"
       }
     },
-<<<<<<< HEAD
-=======
     "node_modules/which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -2870,14 +2550,11 @@
         "node": ">= 8"
       }
     },
->>>>>>> main
     "node_modules/which-module": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
       "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho="
     },
-<<<<<<< HEAD
-=======
     "node_modules/word-wrap": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
@@ -2887,7 +2564,6 @@
         "node": ">=0.10.0"
       }
     },
->>>>>>> main
     "node_modules/wrap-ansi": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
@@ -2901,8 +2577,6 @@
         "node": ">=6"
       }
     },
-<<<<<<< HEAD
-=======
     "node_modules/wrap-ansi/node_modules/ansi-regex": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
@@ -2972,7 +2646,6 @@
         "node": ">=6"
       }
     },
->>>>>>> main
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
@@ -3023,8 +2696,6 @@
         "camelcase": "^5.0.0",
         "decamelize": "^1.2.0"
       }
-<<<<<<< HEAD
-=======
     },
     "node_modules/yargs/node_modules/ansi-regex": {
       "version": "4.1.0",
@@ -3070,7 +2741,6 @@
       "engines": {
         "node": ">=6"
       }
->>>>>>> main
     }
   },
   "dependencies": {
@@ -3214,8 +2884,7 @@
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz",
       "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "adm-zip": {
       "version": "0.5.2",
@@ -4158,11 +3827,6 @@
       "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
       "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="
     },
-    "is_js": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/is_js/-/is_js-0.9.0.tgz",
-      "integrity": "sha1-CrlFQFArp6+iTIVqqYVWFmnpxS0="
-    },
     "is-core-module": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz",
@@ -4210,6 +3874,11 @@
         "is-docker": "^2.0.0"
       }
     },
+    "is_js": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/is_js/-/is_js-0.9.0.tgz",
+      "integrity": "sha1-CrlFQFArp6+iTIVqqYVWFmnpxS0="
+    },
     "isarray": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
@@ -4416,9 +4085,9 @@
       }
     },
     "open": {
-      "version": "7.4.0",
-      "resolved": "https://registry.npmjs.org/open/-/open-7.4.0.tgz",
-      "integrity": "sha512-PGoBCX/lclIWlpS/R2PQuIR4NJoXh6X5AwVzE7WXnWRGvHg7+4TBCgsujUgiPpm0K1y4qvQeWnCWVTpTKZBtvA==",
+      "version": "7.4.2",
+      "resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz",
+      "integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==",
       "requires": {
         "is-docker": "^2.0.0",
         "is-wsl": "^2.1.1"
@@ -4535,15 +4204,12 @@
         "ipaddr.js": "1.9.1"
       }
     },
-<<<<<<< HEAD
-=======
     "punycode": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
       "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
       "dev": true
     },
->>>>>>> main
     "qr-image": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/qr-image/-/qr-image-3.2.0.tgz",
@@ -4806,16 +4472,9 @@
       }
     },
     "systeminformation": {
-<<<<<<< HEAD
-      "version": "5.0.6",
-      "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.0.6.tgz",
-      "integrity": "sha512-sX8I5SPunheS99VYBk1UGzavNMBGTizccaKcYo6TrjPaHF98iFeirexNX99zyGujlNWTVCHiVxzoNdix77hkVw=="
-    },
-    "telegraf": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/telegraf/-/telegraf-4.0.2.tgz",
-      "integrity": "sha512-MTo8b6P/MMb6RbqDGXNWpCXESTihxRpTThOIPAfVBJohYQtywYl/vldjqUCdIYdg+ge8Sn/gk+OXfqHg4LewnA==",
-=======
+      "version": "5.3.3",
+      "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.3.3.tgz",
+      "integrity": "sha512-s9tCz3GQfJ3L5S7KwI3k6jpSPPj1AR1ZoTqtG0UITtA01+1LAeOYz2pzCisCq9XD/KNTuHUl/AXE3zgvy+OR6Q=="
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.3.0.tgz",
       "integrity": "sha512-pNvwU7Oray7xNkS+WOH+FE8Aks8BQ2sV8zwUiZQq97C3Co7oJVnOrgvAJwSwRlIdQTIBbe+0HZLaRrY8pdXsVw=="
@@ -4856,7 +4515,6 @@
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/telegraf/-/telegraf-4.0.3.tgz",
       "integrity": "sha512-QWn9r7IAX4C0kHiP2skieI4pry1SO3YGe2n34a3ymqENeu6bJposut6uR1zLNzOhSPvAxqdlO59bJWGXnADqHQ==",
->>>>>>> main
       "requires": {
         "abort-controller": "^3.0.0",
         "debug": "^4.3.1",
@@ -4919,15 +4577,9 @@
       }
     },
     "typegram": {
-<<<<<<< HEAD
-      "version": "3.1.8",
-      "resolved": "https://registry.npmjs.org/typegram/-/typegram-3.1.8.tgz",
-      "integrity": "sha512-2JiSSpgRjpVUMVFvU+hSs6++HvPiR5FJg91L4a62OGeo/hPv0ecAYMAmcnIsKjVJFzOK26qkkKaACVm9Fd+B4g=="
-=======
       "version": "3.1.9",
       "resolved": "https://registry.npmjs.org/typegram/-/typegram-3.1.9.tgz",
       "integrity": "sha512-qF1cR8W7pm9oohLYPwH8jPZY3dRgA3/jjx0O83sKYHg1RYxIO90oEKH5FmnMq0lhGtX75pH0XOtyIU5e7hve4Q=="
->>>>>>> main
     },
     "unpipe": {
       "version": "1.0.0",
diff --git a/package.json b/package.json
index 2993d92..a2d4622 100644
--- a/package.json
+++ b/package.json
@@ -1,14 +1,9 @@
 {
-<<<<<<< HEAD
-  "name": "bds_maneger_api",
-  "version": "1.4.2",
-=======
   "name": "@the-bds-maneger/bds_maneger_api",
   "publishConfig": {
     "access": "public"
   },
   "version": "1.5.4",
->>>>>>> main
   "description": "scripts to manage minecraft bedrock server",
   "private": false,
   "main": "index.js",
@@ -46,17 +41,13 @@
     "googleapis": "^67.0.0",
     "node-fetch": "^2.6.1",
     "node-localstorage": "^2.1.6",
-    "open": "^7.3.1",
+    "open": "^7.4.2",
     "properties-to-json": "^0.1.7",
     "qr-image": "^3.2.0",
     "qrcode": "^1.4.4",
     "request-ip": "^2.1.3",
     "shelljs": "^0.8.4",
-<<<<<<< HEAD
-    "systeminformation": "^5.0.2",
-=======
     "systeminformation": "^5.0.10",
->>>>>>> main
     "telegraf": "^4.0.0"
   },
   "engines": {
diff --git a/scripts/backups.js b/scripts/backups.js
index 75d32cc..9e47917 100644
--- a/scripts/backups.js
+++ b/scripts/backups.js
@@ -14,10 +14,6 @@ module.exports.World_BAckup = () => {
         const world_name = JSON.parse(java_pro(fs.readFileSync(path.join(bds.bds_dir_java, "server.properties"), "utf8").replaceAll("-", "_"))).level_name
         dir_zip = path.join(bds.bds_dir_java, world_name) //`${require("../index").bds_dir_bedrock}/${world_name}/`
     }
-    /**
-     * Before we can start it is good for the server not to have a Corrupted Backup
-     * this is only necessary once after the server has started manually
-    */
     if (bds.bds_detect()){bds.stop()}
     var zip = new AdmZip();
     zip.addLocalFolder(dir_zip);
@@ -54,20 +50,13 @@ module.exports.Drive_backup = () => {
      * this is only necessary once after the server has started manually
     */
     if (bds.bds_detect()){bds.stop()}
-    var status_b = true
     var zip = new AdmZip();
     zip.addLocalFolder(dir_zip);
     zip.addZipComment(`Backup zip file in ${today}. \nBackup made to ${process.platform}, Free and open content for all\n\nSirherobrine23© By Bds Maneger.`);
     zip.writeZip(name);
-    let es = 1;
-    for(es == "0";es++;){
-        if (!(status_b)) break
-    }
-    const js_ = {
+    return {
         "file_path": name,
-        "file_name": `bds_backup_World_${today}.zip`,
-        "id": undefined
+        "file_name": `bds_backup_World_${today}.zip`
     }
-    return js_
 };