Yet even more merge issues.