Fixed more merge issues