changes in search pages
changes after resolve conflict