Removed line breaks in avatarManifest file
Fixed avatarManifest
Fixed merge conflicts