merged application.html.erb