merge conflict resolution ai