5104cc3276
The keep-both conflict resolution split a function body. Rebuilt from both merge parents so the header-contract test and the session-start tests are each intact. Claude-Session: https://claude.ai/code/session_01C7tEmH86HAr7GoAAKCEHZb