new search page
fixed merge conflict
fix merge conflict