fixed the merge conflict in Users.js