fix merge conflicts

app/controllers/v1/omniauth_callbacks_controller.rb

app/models/collection.rb

app/services/search_service/collection.rb

app/services/search_service/learning_object.rb

app/services/search_service/model.rb

app/workers/attachment_cache_worker.rb

config/initializers/devise_token_auth.rb

config/initializers/omniauth.rb

config/routes.rb

lib/tasks/attachment_maintaining_service.rake

spec/controllers/v1/omniauth_callbacks_controller_spec.rb