Cleaned up the merge

I suck so hard at github