merge part 2