User model testing
resolved conflict