index: replace has_conflicts by conflicts returning None