modify routes.rb
merge conflict
fix the search result page