The agent resolved the merge conflict by keeping both sides, and the code compiled into a dead branch

Two branches land on top of each other. Branch A tightened a broad allow into a narrow allowlist inside one function. Branch B extended that same function with a second condition for a new role. Git m