Changes for artist of the week page
Conflicts resolved