The conflict is main's per-write `observation` facet landing on the same line as
this branch's removal of `resolveCachedClaudeCompactOwnership`. Taking either side
whole would lose real work: the branch's side drops main's observation stamping,
main's side reinstates a call this branch deliberately deleted as unreachable.
Kept both intents — observation is stamped from `boundaryAwarePayload`, which is
what `cachedPayload` reduced to once the correlation cache was removed.