modified show.html.erb
fix the merging