resolves conflicts (#46988)

e2e/support/helpers/e2e-permissions-helpers.js

e2e/test/scenarios/permissions/admin-permissions.cy.spec.js

...cenarios/permissions/permissions-reproductions.cy.spec.js

e2e/test/scenarios/permissions/view-data.cy.spec.js

...box/query_processor/middleware/row_level_restrictions.clj

...permissions/models/permissions/block_permissions_test.clj

...ackend/test/metabase_enterprise/sandbox/api/card_test.clj

...uery_processor/middleware/row_level_restrictions_test.clj

...end/src/metabase-enterprise/advanced_permissions/graph.ts

...tabase-enterprise/advanced_permissions/graph.unit.spec.ts

...end/src/metabase-enterprise/advanced_permissions/index.js

...es/components/EditSandboxingModal/EditSandboxingModal.tsx

...nts/EditSandboxingModal/EditSandboxingModal.unit.spec.tsx

frontend/src/metabase-types/api/permissions.ts

...ns/components/DataPermissionsHelp/DataPermissionsHelp.tsx

...s/PermissionHelpDescription/PermissionHelpDescription.tsx

frontend/src/metabase/admin/permissions/permissions.js

...rc/metabase/admin/permissions/selectors/confirmations.tsx

...se/admin/permissions/selectors/data-permissions/fields.ts

...rmissions/selectors/data-permissions/permission-editor.ts