Resolved conflicts.