diff --git a/install/package.json b/install/package.json
index e4c83041c6..d20d494edd 100644
--- a/install/package.json
+++ b/install/package.json
@@ -58,11 +58,7 @@
         "csurf": "1.11.0",
         "daemon": "1.1.0",
         "diff": "5.1.0",
-<<<<<<< HEAD
         "esbuild": "0.16.3",
-=======
-        "esbuild": "0.15.16",
->>>>>>> ced874173a (fix(deps): update dependency esbuild to v0.15.16 (#11069))
         "express": "4.18.2",
         "express-session": "1.17.3",
         "express-useragent": "1.0.15",