add avatar
resolve conflic