fix incorrect merge