fixed error in layout/application.html.erb caused by commit conflict