cleanup merge issues