Fix conflict (re-add show.html.erb)