the0ne Cleanup merge issue