more merge issues