Main's tree is #11351's head (084695416, merged here earlier) plus #11255
and its regenerated catalogs, so main is recorded as merged and only
those changes are applied.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01DtL5M41G8Nua7HvuFPZkmJ