Remove even more merge issues