Conflift resolution

.gitignore

@@ -6,13 +6,3 @@ coverage/
 dist
 /src/logs
 .DS_Store
-
-        src/controllers/notificationControllers.ts
-        src/entities/Notification.ts
-        src/entities/NotificationItem.ts
-        src/routes/NoficationRoutes.ts
-        src/services/notificationServices/deleteNotification.ts
-        src/services/notificationServices/getNotifications.ts
-        src/services/notificationServices/updateNotification.ts
-        src/utils/getNotifications.ts
-        src/utils/sendNotification.ts

package.json

@@ -36,13 +36,12 @@
     "express-session": "^1.18.0",
     "express-winston": "^4.2.0",
     "highlight.js": "^11.9.0",
-    "joi": "^17.13.1",
     "jsend": "^1.1.0",
     "jsonwebtoken": "^9.0.2",
     "mailgen": "^2.0.28",
     "morgan": "^1.10.0",
     "multer": "^1.4.5-lts.1",
-    "node-nlp": "^4.27.0",
+    "node-nlp": "^3.10.2",
     "nodemailer": "^6.9.13",
     "nodemon": "^3.1.0",
     "passport": "^0.7.0",
@@ -96,6 +95,7 @@
     "eslint-plugin-prettier": "^5.1.3",
     "jest": "^29.7.0",
     "jest-mock-extended": "^3.0.6",
+    "joi": "^17.13.1",
     "prettier": "^3.2.5",
     "supertest": "^7.0.0",
     "ts-jest": "^29.1.2",