Fix design
Add artist artivity. Should we convert this to fragment?
Resolve
Resolve conflict