Regemified for version 0.2.0
Fixed error in curate_conflicts