Merge: Resolved Conflicts.