Fix merge issues with package.json

package.json

@@ -13,19 +13,6 @@
   },
   "dependencies": {
     "@mcrowe/minibloom": "^0.2.0",
-    "chainpad-crypto": "^0.2.5",
-    "chainpad-server": "^5.1.0",
-    "cookie-parser": "^1.4.6",
-    "body-parser": "^1.20.2",
-    "express": "~4.19.2",
-    "fs-extra": "^7.0.0",
-    "get-folder-size": "^2.0.1",
-    "netflux-websocket": "^1.0.0",
-    "http-proxy-middleware": "^2.0.6",
-    "jsonwebtoken": "^9.0.0",
-    "notp": "^2.0.3",
-    "nthen": "0.1.8",
-    "openid-client": "^5.4.2",
     "@node-saml/node-saml": "^4.0.5",
     "alertify.js": "1.0.11",
     "body-parser": "^1.20.2",
@@ -43,7 +30,7 @@
     "croppie": "^2.5.0",
     "dragula": "3.7.2",
     "drawio": "github:cryptpad/drawio-npm#npm-21.8.2+5",
-    "express": "~4.18.2",
+    "express": "~4.19.2",
     "file-saver": "1.3.1",
     "fs-extra": "^7.0.0",
     "get-folder-size": "^2.0.1",