conflict resolution in layouts/application.html.erb