Resolved Merge Conflicts

I really hope this works...