merge issues dealt with