refactored user controller
merge conflict