diff --git a/src/package.json b/src/package.json
index d8b1179a6..b1f1d29ca 100644
--- a/src/package.json
+++ b/src/package.json
@@ -114,13 +114,8 @@
   },
   "scripts": {
     "lint": "eslint .",
-<<<<<<< HEAD
-    "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",
-=======
     "test": "mocha --import=tsx --timeout 120000 --recursive tests/backend/specs ../node_modules/ep_*/static/tests/backend/specs",
     "test-container": "mocha --import=tsx --timeout 5000 tests/container/specs/api",
->>>>>>> 4d665edf5 (reset the test timeout)
     "dev": "node --import tsx node/server.ts",
     "prod": "node --import tsx node/server.ts",
     "ts-check": "tsc --noEmit",
diff --git a/src/tests/backend/common.ts b/src/tests/backend/common.ts
index d12a5ff38..c0cfd1377 100644
--- a/src/tests/backend/common.ts
+++ b/src/tests/backend/common.ts
@@ -191,17 +191,11 @@ exports.handshake = async (socket: any, padId:string, token = padutils.generateA
 /**
  * Convenience wrapper around `socket.send()` that waits for acknowledgement.
  */
-<<<<<<< HEAD:src/tests/backend/common.ts
 exports.sendMessage = async (socket: any, message:any) => await new Promise<void>((resolve, reject) => {
   socket.emit('message', message, (errInfo:{
     name: string,
     message: string,
   }) => {
-=======
-exports.sendMessage = async (socket, message) => await new Promise((resolve, reject) => {
-  if(message.type === "CHANGESET_REQ")
-  socket.emit('message', message, (errInfo) => {
->>>>>>> 53a847ce4 (feat :migrate socket.io 2 -> 3):src/tests/backend/common.js
     if (errInfo != null) {
       const {name, message} = errInfo;
       const err = new Error(message);
diff --git a/src/tests/backend/specs/chat.ts b/src/tests/backend/specs/chat.ts
index d929c563d..5070a30a1 100644
--- a/src/tests/backend/specs/chat.ts
+++ b/src/tests/backend/specs/chat.ts
@@ -41,11 +41,7 @@ const checkHook = async (hookName: string, checkFn?:CheckFN) => {
   });
 };
 
-<<<<<<< HEAD:src/tests/backend/specs/chat.ts
 const sendMessage = (socket: any, data:any) => {
-=======
-const sendMessage = (socket, data) => {
->>>>>>> 53a847ce4 (feat :migrate socket.io 2 -> 3):src/tests/backend/specs/chat.js
   socket.emit('message', {
     type: 'COLLABROOM',
     component: 'pad',
diff --git a/src/tests/backend/specs/socketio.ts b/src/tests/backend/specs/socketio.ts
index 307119a13..cde554e5e 100644
--- a/src/tests/backend/specs/socketio.ts
+++ b/src/tests/backend/specs/socketio.ts
@@ -404,14 +404,10 @@ describe(__filename, function () {
         constructor(name: string, ...args:any) { super(...args); this.name = name; }
       };
       socket.emit('message', message,
-<<<<<<< HEAD:src/tests/backend/specs/socketio.ts
           (errj: {
             message: string,
             name: string,
           }, val: any) => errj != null ? reject(new AckErr(errj.name, errj.message)) : resolve(val));
-=======
-          (errj, val) => errj != null ? reject(new AckErr(errj.name, errj.message)) : resolve(val));
->>>>>>> 53a847ce4 (feat :migrate socket.io 2 -> 3):src/tests/backend/specs/socketio.js
     });
 
     it('handleMessage with ack (success)', async function () {