Fixed user controller
fix conflict