Add name to user model
Resolve conflicts