No, really, resolved conflicts