set entity roles
fixing merge conflict