Fix merge conflict in show.html