application.html.erb conflicts fixed