Fixed error in curate_conflicts