Manually merged stuff that didn't merge on its own
I fucked things up, fixed