Added avatar to users
User merge