[users] Fix routes
[users] Fix conflicts