fix: merge conflicts

Author: Ansonhkg

package.json

@@ -15,7 +15,6 @@
     "show:affected": "npx nx show projects --affected --uncommitted",
     "build:tinny": "node ./local-tests/build.mjs",
     "publish:tinny": "cd ./local-tests && npm publish",
-    "gen:local-network-context": "NETWORK_NAME=naga-develop DIRECTORY_NAME=naga-local bun run packages/networks/src/networks/vNaga/shared/scripts/generate-abi-signatures.ts",
     "gen:docs": "node ./tools/scripts/gen-doc.mjs",
     "gen:readme": "node ./tools/scripts/gen-readme.mjs",
     "gen:local-network-context": "bun run packages/networks/src/networks/vNaga/envs/naga-local/scripts/00-generate-abi-signatures.ts",