adding user avatars
mergin