fix: merge conflicts

backend/src/ee/services/oidc/oidc-config-service.ts

@@ -612,7 +612,7 @@ export const oidcConfigServiceFactory = ({
       tokenEndpoint,
       userinfoEndpoint,
       orgId: org.id,
-      manageGroupMemberships
+      manageGroupMemberships,
       encryptedOidcClientId: encryptor({ plainText: Buffer.from(clientId) }).cipherTextBlob,
       encryptedOidcClientSecret: encryptor({ plainText: Buffer.from(clientSecret) }).cipherTextBlob
     });