Edited code in show.html
Fixed merge conflicts