wip: user controller refactor
user_controller scope
merge conflict