diff --git a/frontend/package.json b/frontend/package.json
index d8b99f93..114893fb 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -47,11 +47,7 @@
     "codelyzer": "^6.0.2",
     "jasmine-core": "~4.0.1",
     "jasmine-spec-reporter": "~7.0.0",
-<<<<<<< HEAD
-    "karma": "~6.3.5",
-=======
     "karma": "~6.3.16",
->>>>>>> master
     "karma-chrome-launcher": "~3.1.0",
     "karma-coverage-istanbul-reporter": "~3.0.2",
     "karma-jasmine": "~4.0.0",
diff --git a/package.json b/package.json
index 1ea3b44d..231067c2 100644
--- a/package.json
+++ b/package.json
@@ -98,13 +98,8 @@
     "mime-types": "^2.1.33",
     "multer": "^1.4.3",
     "mysql": "^2.18.1",
-<<<<<<< HEAD
     "node-fetch": "2.6.1",
     "nodemailer": "^6.7.0",
-=======
-    "node-fetch": "^2.6.7",
-    "nodemailer": "^6.6.2",
->>>>>>> master
     "password-validator": "^5.1.1",
     "puppeteer": "^22.10.0",
     "reflect-metadata": "^0.1.13",