chore: fix merge conflicts

Author: wobsoriano

packages/backend/src/api/__tests__/M2MTokenApi.test.ts

@@ -474,6 +474,9 @@ describe('M2MToken', () => {
 
       const jwtToken = await createSignedM2MJwt();
       await expect(m2mApi.verify({ token: jwtToken })).rejects.toThrow('Failed to resolve JWK during verification');
+    });
+  });
+
   describe('list', () => {
     const machineId = 'mch_1xxxxxxxxxxxxx';
     const mockM2MTokenList = {

packages/backend/src/api/endpoints/M2MTokenApi.ts

@@ -1,3 +1,5 @@
+import type { ClerkPaginationRequest } from '@clerk/shared/types';
+
 import { MachineTokenVerificationError, MachineTokenVerificationErrorCode } from '../../errors';
 import { decodeJwt } from '../../jwt/verifyJwt';
 import type { JwtMachineVerifyOptions } from '../../jwt/verifyMachineJwt';
@@ -6,11 +8,6 @@ import { isM2MJwt } from '../../tokens/machine';
 import { joinPaths } from '../../util/path';
 import { deprecated } from '../../util/shared';
 import type { ClerkBackendApiRequestOptions, RequestFunction } from '../request';
-import type { ClerkPaginationRequest } from '@clerk/shared/types';
-
-import { joinPaths } from '../../util/path';
-import { deprecated } from '../../util/shared';
-import type { ClerkBackendApiRequestOptions } from '../request';
 import type { PaginatedResourceResponse } from '../resources/Deserializer';
 import type { M2MToken } from '../resources/M2MToken';
 import { AbstractAPI } from './AbstractApi';