Resolved conflicts?