Changes merge conflicts in the index page gemfile.lock file
including a bunch of solr files