d
fixed merge conflict on show.html.erb