UserController conflict fix