fixed conflict in solr-update files
added ivy to build