Adds avatar to review
fix conflicts