Resolved Merge Conflicts

...please reattach my head now