diff --git a/src/server_manager/package.json b/src/server_manager/package.json
index a96784cb..8d904f15 100644
--- a/src/server_manager/package.json
+++ b/src/server_manager/package.json
@@ -49,11 +49,7 @@
     "google-auth-library": "^8.0.2",
     "intl-messageformat": "^7",
     "jsonic": "^0.3.1",
-<<<<<<< Updated upstream
-    "lit-element": "^2.3.1",
-=======
     "lit": "^3.1.1",
->>>>>>> Stashed changes
     "node-forge": "^1.3.1",
     "request": "^2.87.0",
     "web-animations-js": "^2.3.1"