fixed merge problem in application.html.erb