changement gestion avatar
resolve conflict
change avatar.url to avatar