diff --git a/src/scripts/migrate.ts b/src/scripts/migrate.ts
index d82e767..e388362 100644
--- a/src/scripts/migrate.ts
+++ b/src/scripts/migrate.ts
@@ -48,15 +48,12 @@ import * as m42 from '../migrations/20250125-create-activity-types';
 import * as m43 from '../migrations/20260113-redesign-dealer-claim-history';
 import * as m44 from '../migrations/20260123-fix-template-id-schema';
 import * as m45 from '../migrations/20260209-add-gst-and-pwc-fields';
-import * as m45a from '../migrations/20260210-add-raw-pwc-responses';
-import * as m45b from '../migrations/20260216-create-api-tokens';
-import * as m46 from '../migrations/20260216-add-qty-hsn-to-expenses';
-import * as m47 from '../migrations/20260217-add-is-service-to-expenses';
-import * as m48 from '../migrations/20260217-create-claim-invoice-items';
+import * as m46 from '../migrations/20260210-add-raw-pwc-responses';
+import * as m47 from '../migrations/20260216-create-api-tokens';
+import * as m48 from '../migrations/20260216-add-qty-hsn-to-expenses';
+import * as m47a from '../migrations/20260217-add-is-service-to-expenses';
+import * as m48a from '../migrations/20260217-create-claim-invoice-items';
 import * as m49 from '../migrations/20260302-refine-dealer-claim-schema';
-<<<<<<< Updated upstream
-import * as m50 from '../migrations/20260309-add-wfm-push-fields';
-=======
 import * as m50 from '../migrations/20260220-create-form16-tables';
 import * as m51 from '../migrations/20260220000001-add-form16-ocr-extracted-data';
 import * as m52 from '../migrations/20260222000001-create-tds-26as-entries';
@@ -66,7 +63,7 @@ import * as m55 from '../migrations/20260225000001-add-form16-26as-upload-log-id
 import * as m56 from '../migrations/20260225000001-create-form16-non-submitted-notifications';
 import * as m57 from '../migrations/20260225100001-add-form16-archived-at';
 import * as m58 from '../migrations/20260303100001-drop-form16a-number-unique';
->>>>>>> Stashed changes
+import * as m59 from '../migrations/20260309-add-wfm-push-fields';
 
 interface Migration {
   name: string;
@@ -122,15 +119,12 @@ const migrations: Migration[] = [
   { name: '20260113-redesign-dealer-claim-history', module: m43 },
   { name: '20260123-fix-template-id-schema', module: m44 },
   { name: '20260209-add-gst-and-pwc-fields', module: m45 },
-  { name: '20260210-add-raw-pwc-responses', module: m45a },
-  { name: '20260216-create-api-tokens', module: m45b },
-  { name: '20260216-add-qty-hsn-to-expenses', module: m46 },
-  { name: '20260217-add-is-service-to-expenses', module: m47 },
-  { name: '20260217-create-claim-invoice-items', module: m48 },
-<<<<<<< Updated upstream
+  { name: '20260210-add-raw-pwc-responses', module: m46 },
+  { name: '20260216-create-api-tokens', module: m47 },
+  { name: '20260216-add-qty-hsn-to-expenses', module: m48 },
+  { name: '20260217-add-is-service-to-expenses', module: m47a },
+  { name: '20260217-create-claim-invoice-items', module: m48a },
   { name: '20260302-refine-dealer-claim-schema', module: m49 },
-  { name: '20260309-add-wfm-push-fields', module: m50 }
-=======
   { name: '20260220-create-form16-tables', module: m50 },
   { name: '20260220000001-add-form16-ocr-extracted-data', module: m51 },
   { name: '20260222000001-create-tds-26as-entries', module: m52 },
@@ -139,9 +133,9 @@ const migrations: Migration[] = [
   { name: '20260225000001-add-form16-26as-upload-log-id-and-tables', module: m55 },
   { name: '20260225000001-create-form16-non-submitted-notifications', module: m56 },
   { name: '20260225100001-add-form16-archived-at', module: m57 },
-  { name: '20260302-refine-dealer-claim-schema', module: m49 },
   { name: '20260303100001-drop-form16a-number-unique', module: m58 },
->>>>>>> Stashed changes
+  { name: '20260309-add-wfm-push-fields', module: m59 },
+
 ];
 
 /**