diff --git a/package.json b/package.json
index a6378fc0..d17f00cf 100644
--- a/package.json
+++ b/package.json
@@ -1,26 +1,8 @@
 {
   "dependencies": {
-<<<<<<< HEAD
-    "@types/express": "^4.17.14",
-    "amqplib": "^0.10.3",
-    "axios": "^1.2.6",
-    "cors": "^2.8.5",
-    "cors-anywhere": "^0.4.4",
-    "express": "^4.18.2",
-    "lodash.get": "^4.4.2",
-    "mongoose": "^6.7.2",
-    "nodemon": "^3.0.1",
-    "ts-node": "^10.9.1",
-    "typescript": "^4.9.3"
-  },
-  "devDependencies": {
-    "@types/amqplib": "^0.10.3",
-    "@types/node": "^20.8.9"
-=======
     "typescript-coverage-report": "^0.7.0"
   },
   "scripts": {
     "ts-coverage": "typescript-coverage-report"
->>>>>>> master
   }
 }