Fix even more merge issues