solr config change
merged conflicts