change avatar
fix confilt