Merge users and userController