Users.txt
Fixed merge errors for Users.txt