resolve merge issues