Update search.cpp

clean-up of manual merge