cleanup merge issue