Getting rid of PID and adding OCR_t to the basic search
Fixing merge conflict in solrconfig.xml