git add -A captured the stale submodule pointer on Howard's machine (April 18 init, not updated) and committed it, causing a conflict. Now sync always runs git submodule update --remote first so the pointer is current before staging. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>