resolve merge conflict

Bumps [typescript](https://github.com/Microsoft/TypeScript) from 5.4.5 to 5.5.4.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml)
- [Commits](https://github.com/Microsoft/TypeScript/compare/v5.4.5...v5.5.4)

---
updated-dependencies:
- dependency-name: typescript
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

package-lock.json

@@ -83,7 +83,7 @@
         "esbuild": "^0.19.9",
         "prettier": "^3.3.2",
         "tsx": "^4.18.0",
-        "typescript": "^5.4.5"
+        "typescript": "^5.5.4"
       },
       "engines": {
         "node": ">=18.14",
@@ -6207,9 +6207,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.4.5",
+      "version": "5.5.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz",
-      "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
+      "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==",
       "dev": true,
       "bin": {
         "tsc": "bin/tsc",

package.json

@@ -105,6 +105,6 @@
     "esbuild": "^0.19.9",
     "prettier": "^3.3.2",
     "tsx": "^4.18.0",
-    "typescript": "^5.4.5"
+    "typescript": "^5.5.4"
   }
 }