diff --git a/src/package.json b/src/package.json
index 1e197748c..7093dfe23 100644
--- a/src/package.json
+++ b/src/package.json
@@ -63,11 +63,7 @@
     "security": "1.0.0",
     "semver": "^7.6.0",
     "socket.io": "^3.1.2",
-<<<<<<< HEAD
-    "socket.io-client": "^4.7.4",
-=======
     "socket.io-client": "^3.1.2",
->>>>>>> 53a847ce4 (feat :migrate socket.io 2 -> 3)
     "superagent": "^8.1.2",
     "terser": "^5.28.1",
     "threads": "^1.7.0",
@@ -118,13 +114,8 @@
   },
   "scripts": {
     "lint": "eslint .",
-<<<<<<< HEAD
-    "test": "mocha --import=tsx --timeout 120000 --recursive tests/backend/specs/**.ts tests/backend/specs/**/*.ts ../node_modules/ep_*/static/tests/backend/specs",
-    "test-container": "mocha --import=tsx --timeout 5000 tests/container/specs/api",
-=======
     "test": "mocha --import=tsx --timeout 990000 --recursive tests/backend/specs ../node_modules/ep_*/static/tests/backend/specs",
     "test-container": "mocha --import=tsx --timeout 99000 tests/container/specs/api",
->>>>>>> 53a847ce4 (feat :migrate socket.io 2 -> 3)
     "dev": "node --import tsx node/server.ts",
     "prod": "node --import tsx node/server.ts",
     "ts-check": "tsc --noEmit",