Merge: Resolved Conflicts