The agent resolved the merge conflict by keeping both sides, and the code compiled into a dead branch
Two branches edited the same block; the agent removed the conflict markers by stacking both versions, and typecheck went green. One side stayed reachable, the other became dead code nobody deleted. Why keeping both sides compiles, what it leaves behind, and the diff that catches a deferred choice.
