fix user controller
merge confilct