Fixed merge conflict artifact in application.html.erb