Fix feed and avatar
Merge