merge

Modules/Internal/Services/MemberEnrollmentService.php

@@ -655,11 +655,7 @@ class MemberEnrollmentService
                     'start' => $corporate->currentPolicy->start
                 ]), 0, null, $row);
             }
-<<<<<<< HEAD
-           
-=======
             
->>>>>>> origin/staging
             if ($members_expire_date >= $corporate->currentPolicy->end && ($members_expire_date != $corporate->currentPolicy->end)) {
                 throw new ImportRowException(__('enrollment.LESS_THAN', [
                     'date_param' => 'Member Expired Date',
@@ -811,11 +807,7 @@ class MemberEnrollmentService
                         ->where('member_id', $row['member_id'])
                         ->first();
                     
-<<<<<<< HEAD
-                    // Validate If Exist Member
-=======
                     // // Validate If Exist Member
->>>>>>> origin/staging
                     if (!$member) {
                         throw new ImportRowException(__('enrollment.MEMBER_NOT_FOUND', [
                             'member_id' => $row['member_id'],