[WIP] Fix issue with unresolved conflict markers in sync#469

Claude wants to merge 5 commits intomainJebel-Quant/rhiza-cli:mainfrom

claude/improve-conflict-resolutionJebel-Quant/rhiza-cli:claude/improve-conflict-resolutionCopy head branch name to clipboard