fixed more merge issues