changes in the avatar service
resolved conflicts