user controller change
merge conflist in user_controller