fix conflicts

Author: timkpaine

Cargo.lock

@@ -55,11 +55,7 @@
     "@playwright/test": "^1.55.1",
     "@prospective.co/procss": "^0.1.17",
     "cpy": "^12.0.1",
-<<<<<<< before updating
-    "esbuild": "^0.25.5",
-=======
     "esbuild": "^0.25.10",
->>>>>>> after updating
     "esbuild-plugin-less": "^1.3.27",
     "http-server": "^14.1.1",
     "nodemon": "^3.1.10",