making one merge fix in the user model spec