Completed merge of show.js.erb