changed the role chooser
merge conflict