diff --git a/tests/package-lock.json b/tests/package-lock.json
index 8be353ea8..498385a53 100644
--- a/tests/package-lock.json
+++ b/tests/package-lock.json
@@ -14,11 +14,7 @@
         "@eslint-community/eslint-plugin-eslint-comments": "^4.3.0",
         "@typescript-eslint/eslint-plugin": "^7.8.0",
         "@typescript-eslint/parser": "^7.8.0",
-<<<<<<< 714-feature-end-to-end-enter-room
-        "@vuepress/bundler-vite": "^2.0.0-rc.13",
-=======
         "@vuepress/bundler-vite": "^2.0.0-rc.14",
->>>>>>> master
         "cypress": "^13.12.0",
         "cypress-network-idle": "^1.14.2",
         "eslint": "^8.57.0",