added method needed for RoleAdmin
fixed conflicts