fix merge conflicts

Gemfile.lock

app/assets/images/icons/collection1.png

app/assets/images/icons/square.png

app/assets/javascripts/application/accessibility.js

app/assets/javascripts/application/collections.coffee

app/assets/javascripts/application/complaints.coffee

app/assets/javascripts/application/search.js

app/assets/stylesheets/application.scss

app/assets/stylesheets/application/learning_objects.scss

app/assets/stylesheets/application/search.scss

app/assets/stylesheets/application/spinners.css

app/controllers/application_controller.rb

app/controllers/collections_controller.rb

app/controllers/complaints_controller.rb

app/controllers/concerns/reportable.rb

app/controllers/learning_objects_controller.rb

app/controllers/search_controller.rb

app/controllers/subjects_controller.rb

app/controllers/users_controller.rb

app/controllers/welcome_controller.rb