diff --git a/web/vtadmin/package-lock.json b/web/vtadmin/package-lock.json
index 94c5f816027..0f882fb6f9e 100644
--- a/web/vtadmin/package-lock.json
+++ b/web/vtadmin/package-lock.json
@@ -17287,15 +17287,9 @@
       }
     },
     "node_modules/ws": {
-<<<<<<< HEAD
-      "version": "8.13.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
-      "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
-=======
       "version": "8.18.0",
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
       "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
->>>>>>> 43e828049c (VTAdmin: Upgrade websockets js package (#16504))
       "dev": true,
       "engines": {
         "node": ">=10.0.0"