conflict resolvd