Resolved Merge Conflicts

Resolved Merge Conflicts