Fix merge conflicts

packages/server/package.json

@@ -1,6 +1,6 @@
 {
     "name": "flowise",
-    "version": "1.4.3",
+    "version": "1.6.0",
     "description": "Flowiseai Server",
     "main": "dist/index",
     "types": "dist/index.d.ts",
@@ -51,7 +51,8 @@
         "@types/lodash": "^4.14.202",
         "@types/uuid": "^9.0.7",
         "async-mutex": "^0.4.0",
-        "axios": "^0.27.2",
+        "axios": "1.6.2",
+        "content-disposition": "0.5.4",
         "cors": "^2.8.5",
         "crypto-js": "^4.1.1",
         "dotenv": "^16.0.0",
@@ -67,7 +68,9 @@
         "mysql": "^2.18.1",
         "openai": "^4.20.0",
         "pg": "^8.11.1",
+        "posthog-node": "^3.5.0",
         "reflect-metadata": "^0.1.13",
+        "sanitize-html": "^2.11.0",
         "socket.io": "^4.6.1",
         "sqlite3": "^5.1.6",
         "typeorm": "^0.3.6",
@@ -75,9 +78,11 @@
         "winston": "^3.9.0"
     },
     "devDependencies": {
+        "@types/content-disposition": "0.5.8",
         "@types/cors": "^2.8.12",
         "@types/crypto-js": "^4.1.1",
         "@types/multer": "^1.4.7",
+        "@types/sanitize-html": "^2.9.5",
         "concurrently": "^7.1.0",
         "nodemon": "^2.0.22",
         "oclif": "^3",