Merge conflict solved and show.html.erb can be committed again