fix incorrect merge part 2
fix incorrect merge part 3