Actually fixed merge conflicts.