fix merge conflict in search index.html.erb