merge_conflicts++