Auto fix conflicts

What variant of Codex are you using?

Web

What feature would you like to see?

It seems that codex falls into conflicts a lot for example branch has conflicts that must be resolved
Use the web editor or the command line to resolve conflicts before continuing.
README.md
index.html

This happens all the time and I don't understand why because I didn't edit any files

Additional information

_No response_