Address merge conflicts

frontend/src/hooks/api/index.tsx

@@ -7,12 +7,14 @@ export * from "./dynamicSecret";
 export * from "./dynamicSecretLease";
 export * from "./groups";
 export * from "./identities";
+export * from "./identityProjectAdditionalPrivilege";
 export * from "./incidentContacts";
 export * from "./integrationAuth";
 export * from "./integrations";
 export * from "./keys";
 export * from "./ldapConfig";
 export * from "./organization";
+export * from "./projectUserAdditionalPrivilege";
 export * from "./roles";
 export * from "./scim";
 export * from "./secretApproval";