fix incorrect merge part 4