Resolved conflicts in routes and users_controller