merge show.html.erb