Exit code 1
error: Your local changes to the following files would be overwritten by merge:
	.claude/settings.local.json
Please commit your changes or stash them before you merge.
Aborting

On branch main
Your branch is up to date with 'origin/main'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
	modified:   .claude/settings.local.json

Untracked files:
  (use "git add <file>..." to include in what will be committed)
	msp-toolkit/BUILD-EXE.md
	msp-toolkit/build-bundled.ps1
	msp-toolkit/build-exe.ps1
	msp-toolkit/msp-fix.ps1
	whm-dns-cleanup/

no changes added to commit (use "git add" and/or "git commit -a")
The stash entry is kept in case you need it again.