Merge stuff, add Avatar images