Completed merge conflict resolution.