#conflicts

Codex Stalls on a Merge Conflict or Resolves It the Wrong Way

Codex hits conflict markers and either stops, picks the wrong side, or hand-edits the markers into the file. Pre-rebase setup.sh and explicit AGENTS.md rules fix it.