Resolved Merge conflicts.