fix merge conflict, remove redundant search box