More fixing of bad merging. I suck at git