fixed merge issues in application.rb