solr stuff do not merge