Actually fixed merge conflicts