fixed merge problem with shifted avatar