Fix conflict in app.html.erb