Merge: Resolved conflicts.