search view
fix merge error