Update application.html.haml
merge conflict