resolves conflicts (#46988)

...e/admin/permissions/selectors/data-permissions/schemas.ts

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

frontend/src/metabase/admin/permissions/types.ts

...nd/src/metabase/admin/permissions/utils/data-entity-id.ts

...etabase/admin/permissions/utils/graph/data-permissions.ts

...min/permissions/utils/graph/data-permissions.unit.spec.ts

...metabase/admin/permissions/utils/graph/partial-updates.ts

...dmin/permissions/utils/graph/partial-updates.unit.spec.ts

...src/metabase/components/ConfirmContent/ConfirmContent.tsx

frontend/src/metabase/plugins/index.ts

src/metabase/api/permission_graph.clj

src/metabase/models/data_permissions.clj

src/metabase/models/data_permissions/graph.clj

src/metabase/models/query/permissions.clj

src/metabase/query_processor/middleware/permissions.clj

test/metabase/api/card_test.clj

test/metabase/api/database_test.clj

test/metabase/api/dataset_test.clj

test/metabase/models/data_permissions/graph_test.clj

test/metabase/models/data_permissions_test.clj