fixed a conflict in User.php