Resolved Merge Conflicts

Resolved some merge conflicts.