solr admin page
fix merge conflict