rethink of the solr json to dict structure
dealt with merge conflict