diff --git a/src/package.json b/src/package.json
index 7093dfe23..d8b1179a6 100644
--- a/src/package.json
+++ b/src/package.json
@@ -114,8 +114,13 @@
   },
   "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",