fix incorrect merge part 5