updated artist dashboard
merged conflicts