resolved more merge issues