introduce git_conflict_iterator