diff --git a/apps/edr-freight-api/src/migrations/1821000000002-CreateInvoices.ts b/apps/edr-freight-api/src/migrations/1821000000002-CreateInvoices.ts
index 449863750..09cb68262 100644
--- a/apps/edr-freight-api/src/migrations/1821000000002-CreateInvoices.ts
+++ b/apps/edr-freight-api/src/migrations/1821000000002-CreateInvoices.ts
@@ -15,24 +15,6 @@ export class CreateInvoices1821000000002 implements MigrationInterface {
   name = "CreateInvoices1821000000002";
 
   public async up(queryRunner: QueryRunner): Promise<void> {
-<<<<<<< HEAD
-    const typeExists = await queryRunner.query(
-      `SELECT 1 FROM pg_type WHERE typname = 'invoices_status_enum' AND typnamespace = 'freight'::regnamespace;`,
-    );
-
-    if (!typeExists.length) {
-      await queryRunner.query(`
-        CREATE TYPE freight.invoices_status_enum AS ENUM (
-          'DRAFT',
-          'PENDING',
-          'PAID',
-          'OVERDUE',
-          'CANCELLED',
-          'REFUNDED'
-        );
-      `);
-    }
-=======
     await queryRunner.query(`
       CREATE TYPE IF NOT EXISTS freight.invoices_status_enum AS ENUM (
         'DRAFT',
@@ -43,7 +25,6 @@ export class CreateInvoices1821000000002 implements MigrationInterface {
         'REFUNDED'
       );
     `);
->>>>>>> 3ceacbe9a9087498cf007111b7b09ad3d35bce35
 
     await queryRunner.query(`
       CREATE TABLE freight.invoices (
diff --git a/apps/edr-freight-api/src/modules/first-mile/entities/first-mile.entity.ts b/apps/edr-freight-api/src/modules/first-mile/entities/first-mile.entity.ts
index b2eb3801f..319350b43 100644
--- a/apps/edr-freight-api/src/modules/first-mile/entities/first-mile.entity.ts
+++ b/apps/edr-freight-api/src/modules/first-mile/entities/first-mile.entity.ts
@@ -35,8 +35,8 @@ export class FirstMile extends BaseEntity {
   @Column({ name: 'remaining_payment', type: 'numeric', precision: 14, scale: 2, default: 0 })
   remainingPayment!: number;
 
-  // @Column({ type: 'boolean', default: false })
-  // isPostPaymentCompleted!: boolean;
+  @Column({ type: 'boolean', default: false })
+  isPostPaymentCompleted!: boolean;
 
   @Column({ name: 'estimated_km', type: 'numeric', precision: 10, scale: 2, nullable: true })
   estimatedKm?: number | null;
diff --git a/apps/edr-freight-api/src/modules/last-mile/entities/last-mile.entity.ts b/apps/edr-freight-api/src/modules/last-mile/entities/last-mile.entity.ts
index 61aad0d72..c1787cda8 100644
--- a/apps/edr-freight-api/src/modules/last-mile/entities/last-mile.entity.ts
+++ b/apps/edr-freight-api/src/modules/last-mile/entities/last-mile.entity.ts
@@ -35,8 +35,8 @@ export class LastMile extends BaseEntity {
   @Column({ name: 'remaining_payment', type: 'numeric', precision: 14, scale: 2, default: 0 })
   remainingPayment!: number;
 
-  // @Column({ type: 'boolean', default: false })
-  // isPostPaymentCompleted!: boolean;
+  @Column({ type: 'boolean', default: false })
+  isPostPaymentCompleted!: boolean;
 
   @Column({ name: 'estimated_km', type: 'numeric', precision: 10, scale: 2, nullable: true })
   estimatedKm?: number | null;