Merege conflicts with aplication.html.erb