Add avatar to users
Resolve conflicts
Resolve moar conflicts