fixed merge conflicts in application_controller.rb