render search results list
fix the conflicts