resolved conflict

resources/views/app/patient/claims-resolver.blade.php

@@ -22,6 +22,7 @@
     $totalNotesWithBillingClosed = 0;
     $totalNotesWithClaimingClosed = 0;
     foreach($patient->notesAscending as $note){
+        if($note->is_cancelled) continue;
         $hcpIdToProMap[$note->hcp_pro_id] = $note->hcpPro;
         $d = $note->effective_dateest;
         $firstDateSeenByHcpMap[$note->hcp_pro_id] = isset($firstDateSeenByHcpMap[$note->hcp_pro_id]) ? $firstDateSeenByHcpMap[$note->hcp_pro_id] : $d;
@@ -221,7 +222,7 @@
             $loopLastContentByHcp = [];
             $rowIndex = 0;
             foreach($patient->notesAscending as $note){
-
+                if($note->is_cancelled) continue;
                 $rowIndex++;
 
                 $d = $note->effective_dateest;