seach results page updated
search results
merge conflict