fix

Author: Uanela

packages/arkos/package.json

@@ -76,17 +76,6 @@
   },
   "typesVersions": {
     "*": {
-<<<<<<< HEAD
-      "*": ["./dist/types/exports/*/index.d.ts"],
-      "services": ["./dist/types/exports/services/index.d.ts"],
-      "validation": ["./dist/types/exports/validation/index.d.ts"],
-      "error-handler": ["./dist/types/exports/error-handler/index.d.ts"],
-      "prisma": ["./dist/types/exports/prisma/index.d.ts"],
-      "auth": ["./dist/types/exports/auth/index.d.ts"],
-      "middlewares": ["./dist/types/exports/middlewares/index.d.ts"],
-      "utils": ["./dist/types/exports/utils/index.d.ts"],
-      "websockets": ["./dist/types/exports/websockets.d.ts"]
-=======
       "*": [
         "./dist/types/exports/*/index.d.ts"
       ],
@@ -110,8 +99,8 @@
       ],
       "utils": [
         "./dist/types/exports/utils/index.d.ts"
-      ]
->>>>>>> b2f62bca7d9ae21c1d612b73ad7b6b1639a12463
+      ],
+      "websockets": ["./dist/types/exports/websockets.d.ts"]
     }
   },
   "scripts": {
@@ -196,12 +185,8 @@
     "knip": "6.0.1",
     "mimetype": "0.0.8",
     "openapi-types": "12.1.3",
-<<<<<<< HEAD
-    "prisma": "6.19.2",
     "socket.io": "^4.8.3",
-=======
     "prisma": "6.19.3",
->>>>>>> b2f62bca7d9ae21c1d612b73ad7b6b1639a12463
     "ts-jest": "29.3.1",
     "ts-node": "^10.9.2",
     "ts-prune": "0.10.3",
@@ -230,24 +215,14 @@
     "dotenv": "17.4.2",
     "dotenv-expand": "13.0.0",
     "express": "4.22.2",
-<<<<<<< HEAD
-    "express-rate-limit": "8.4.1",
-    "html-to-text": "9.0.5",
-    "jsonwebtoken": "9.0.3",
-    "mimetype": "0.0.8",
-    "multer": "2.1.1",
-    "nodemailer": "8.0.7",
-    "sharp": "0.34.5",
     "socket.io": "^4.8.3",
-=======
     "express-rate-limit": "8.6.1",
     "html-to-text": "9.0.5",
     "jsonwebtoken": "9.0.3",
     "mimetype": "0.0.8",
     "multer": "2.2.0",
     "nodemailer": "9.0.3",
     "sharp": "0.35.3",
->>>>>>> b2f62bca7d9ae21c1d612b73ad7b6b1639a12463
     "swagger-jsdoc": "6.2.8",
     "zod": "3.25.76",
     "zod-to-json-schema": "3.24.6"