Cleaned up the failed merge conflicts :(

Ugh.. It won't stop!