clean up from previous merge part 2