fixed merge part 2