Merge Fixes

Cleaned out all the merge errors