ai-resolve-conflicts

Use when git reports merge conflicts during rebase, merge, cherry-pick, or revert operations.