Automatic merge conflict handling for automations

[jalaziz]

We have multiple automations enabled and sometimes their updates conflict. Afters one PR gets merged, others will be get stack with merge conflicts.

Currently, automations don't seem to handle this situation at all:

• The automation doesn't detect and fix the conflicts automatically
• Re-running the automation doesn't fix the conflicts
• Manually prompting the agent to fix the conflicts on the branch doesn't work

Mintlify automations and agents should automatically detect merge conflicts on a branch and fix them automatically.