Fixing merge conflict mess ups oh boy was this fucked