cleanup merge testing