Changes to User Controller
Merging changes