refactor users controller
fix merge conflicts