Joe | Fixed show.html.erb merge conflict