WIP - Re-uploading avatar from dashboard
merge conflict