ai merge conflict resolution