Solved merge conflict application.html.erb