Actually resolved conflicts