Fix even more merge conflicts