Chat status incorrectly showed an old branch (already merged) & merge conflicts message

What version of the Codex App are you using (From “About Codex” dialog)?

26.803.61601

What subscription do you have?

Pro 5x

What platform is your computer?

macOS Darwin 27.0.0 arm64 arm

What issue are you seeing?

In all current and new chats in Codex, they're incorrectly listing a branch "Test-2" that was merged on April 22, 2026. It also indicated that there's merge conflicts when there are no branches left, everything had been successfully merged.

I've attemped those fixes:
• Commit & push everything
• Created a new branch then merged it
• Created a new PR then merged it

Possible cause:
A few weeks ago I accidentally created a new PR via Claude Code mac app. I've merged that branch but somehow it messed up Codex. I haven't been able to reproduce or undo this bug.

What steps can reproduce the bug?

Unknown if this is actually the cause but here's what I think was the cause:

Both Codex and Claude Code opened (mac apps)
Both have a chat building something on the same code project
I clicked on "Create PR" button in Claude Code and accepted it
At some point afterward I noticed Codex started showing old branch & merge conflicts message in all its chats.

What is the expected behavior?

No response

Additional information

No response

Start by reproducing the issue in the Codex macOS app with a project whose branch and pull request have already been merged. Investigate why all chats still show the old Test-2 branch and merge-conflict status; done means no stale branch or conflict message remains after the merge.