Fixes everything that broke from the merge