search bar in home page
merge conflicts