diff --git a/package-lock.json b/package-lock.json
index ae7645706..f1ac18d1b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,16 +1,11 @@
 {
   "name": "thinx",
-<<<<<<< HEAD
   "version": "1.9.2578",
-=======
-  "version": "1.9.2451",
->>>>>>> 7a8f94062394ef0d07c4646a0f1d84218cbe23d5
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "thinx",
-<<<<<<< HEAD
       "version": "1.9.2578",
       "license": "ISC",
       "dependencies": {
@@ -19,16 +14,6 @@
         "@slack/web-api": "^6.9.1",
         "@snyk/protect": "^1.1258.0",
         "axios": "^1.7.7",
-=======
-      "version": "1.9.2451",
-      "license": "ISC",
-      "dependencies": {
-        "@hapi/hoek": "9.0.3",
-        "@slack/rtm-api": "^6.1.1",
-        "@slack/web-api": "^6.9.1",
-        "@snyk/protect": "^1.657.0",
-        "axios": "^1.6.0",
->>>>>>> 7a8f94062394ef0d07c4646a0f1d84218cbe23d5
         "base-64": "^0.1.0",
         "bcrypt": "^5.0.0",
         "body-parser": "^1.19.0",
@@ -37,11 +22,7 @@
         "chai-http": "^4.3.0",
         "chalk": "^5.3.0",
         "chmodr": "^1.2.0",
-<<<<<<< HEAD
         "coap": "^1.3.0",
-=======
-        "coap": "^0.26.0",
->>>>>>> 7a8f94062394ef0d07c4646a0f1d84218cbe23d5
         "connect-redis": "^6.1.3",
         "connect-timeout": "^1.9.0",
         "cookie-parser": "^1.4.7",
@@ -52,11 +33,7 @@
         "express-session": "^1.18.1",
         "fs-extra": "^11.2.0",
         "fs-finder": "github:suculent/Node-FsFinder#master",
-<<<<<<< HEAD
         "helmet": "^7.1.0",
-=======
-        "helmet": "^4.6.0",
->>>>>>> 7a8f94062394ef0d07c4646a0f1d84218cbe23d5
         "http-signature": "^1.3.5",
         "influx": "^5.9.3",
         "jshint": "^2.13.4",
@@ -93,11 +70,7 @@
         "typeof": "^1.0.0",
         "utf-8": "^2.0.0",
         "uuid": "^8.3.2",
-<<<<<<< HEAD
         "ws": "^8.14.2",
-=======
-        "ws": "^7.5.10",
->>>>>>> 7a8f94062394ef0d07c4646a0f1d84218cbe23d5
         "yaml": "2.2.2"
       },
       "devDependencies": {
@@ -1199,7 +1172,6 @@
         "@redis/client": "^1.0.0"
       }
     },
-<<<<<<< HEAD
     "node_modules/@sideway/address": {
       "version": "4.1.5",
       "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.5.tgz",
@@ -1234,8 +1206,6 @@
       "dev": true,
       "license": "MIT"
     },
-=======
->>>>>>> 7a8f94062394ef0d07c4646a0f1d84218cbe23d5
     "node_modules/@slack/logger": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/@slack/logger/-/logger-2.0.0.tgz",
@@ -1373,25 +1343,10 @@
       }
     },
     "node_modules/@socket.io/component-emitter": {
-<<<<<<< HEAD
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.2.tgz",
       "integrity": "sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA==",
       "license": "MIT"
-=======
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz",
-      "integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg=="
-    },
-    "node_modules/@types/bl": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/@types/bl/-/bl-5.1.0.tgz",
-      "integrity": "sha512-VXd3oG66/bay2tlApl0U3BrdkGop68tYTzybJO2xzAtLFk6ULWKIm+UGbrG9Ev8t+yuQd2uUm2m6wUP8XO8mfA==",
-      "deprecated": "This is a stub types definition. bl provides its own type definitions, so you do not need this installed.",
-      "dependencies": {
-        "bl": "*"
-      }
->>>>>>> 7a8f94062394ef0d07c4646a0f1d84218cbe23d5
     },
     "node_modules/@types/chai": {
       "version": "4.3.20",
@@ -2566,10 +2521,7 @@
       "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
       "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
       "dev": true,
-<<<<<<< HEAD
       "license": "MIT",
-=======
->>>>>>> 7a8f94062394ef0d07c4646a0f1d84218cbe23d5
       "engines": {
         "node": ">=0.1.90"
       }
@@ -4512,7 +4464,6 @@
         "node": ">= 0.12"
       }
     },
-<<<<<<< HEAD
     "node_modules/form-data/node_modules/safe-buffer": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
@@ -4533,8 +4484,6 @@
       ],
       "license": "MIT"
     },
-=======
->>>>>>> 7a8f94062394ef0d07c4646a0f1d84218cbe23d5
     "node_modules/formidable": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/formidable/-/formidable-2.1.2.tgz",
@@ -5355,12 +5304,8 @@
     "node_modules/htmlparser2/node_modules/string_decoder": {
       "version": "0.10.31",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-<<<<<<< HEAD
       "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==",
       "license": "MIT"
-=======
-      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ=="
->>>>>>> 7a8f94062394ef0d07c4646a0f1d84218cbe23d5
     },
     "node_modules/http-errors": {
       "version": "2.0.0",
@@ -6498,12 +6443,8 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
       "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
-<<<<<<< HEAD
       "dev": true,
       "license": "MIT"
-=======
-      "dev": true
->>>>>>> 7a8f94062394ef0d07c4646a0f1d84218cbe23d5
     },
     "node_modules/json-schema": {
       "version": "0.4.0",
@@ -6766,10 +6707,7 @@
       "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
       "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
       "dev": true,
-<<<<<<< HEAD
       "license": "MIT",
-=======
->>>>>>> 7a8f94062394ef0d07c4646a0f1d84218cbe23d5
       "dependencies": {
         "json-buffer": "3.0.1"
       }
@@ -8704,12 +8642,8 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-<<<<<<< HEAD
       ],
       "license": "MIT"
-=======
-      ]
->>>>>>> 7a8f94062394ef0d07c4646a0f1d84218cbe23d5
     },
     "node_modules/random-bytes": {
       "version": "1.0.0",
@@ -8953,12 +8887,8 @@
       "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
       "integrity": "sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==",
       "deprecated": "https://github.com/lydell/resolve-url#deprecated",
-<<<<<<< HEAD
       "dev": true,
       "license": "MIT"
-=======
-      "dev": true
->>>>>>> 7a8f94062394ef0d07c4646a0f1d84218cbe23d5
     },
     "node_modules/retry": {
       "version": "0.13.1",
@@ -10597,15 +10527,9 @@
       }
     },
     "node_modules/ws": {
-<<<<<<< HEAD
       "version": "8.18.0",
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
       "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
-=======
-      "version": "7.5.10",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
-      "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
->>>>>>> 7a8f94062394ef0d07c4646a0f1d84218cbe23d5
       "license": "MIT",
       "engines": {
         "node": ">=10.0.0"