fix(User.js): Fix merge conflict issues