Merge branch 'main' into fix/add_commit_before_publish

Author: jremy42

Makefile

@@ -44,11 +44,6 @@ generate-global-sdk-package:
 publish: install-dependencies
 	pnpm run build
 	pnpm lerna changed
-<<<<<<< Updated upstream
-	pnpm exec lerna publish -y --registry $(NPM_PUBLISH_REGISTRY) --ignore-scripts
-=======
-	# Commit any generated files before versioning
 	git add .
 	git commit -m "chore: update generated files" || true
 	pnpm lerna version -y --no-private --force-git-tag --create-release github
->>>>>>> Stashed changes