Resolved the merge conflicts.