CSV & Solr Fix
Merge Conflict