Updating UserDao
Updates
Resolving conflicts
resolving conflict