allow change of role for user
fix conflict