finish artist show page
merge