Actually fixed merge