other merge issues