Resolved conflicts