diff --git a/SAS/ResourceAssignment/ResourceAssignmentDatabase/radb.py b/SAS/ResourceAssignment/ResourceAssignmentDatabase/radb.py
index 123e4c1c3dbd6998242b101bd7f544caf7836cbd..d2df8fc9a63ec4c6caefa75304890a943cad5e63 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentDatabase/radb.py
+++ b/SAS/ResourceAssignment/ResourceAssignmentDatabase/radb.py
@@ -1188,29 +1188,31 @@ class RADatabase:
             if claim['id'] not in claimDict:
                 resource2otherClaims[claim['resource_id']].append(claim)
 
-        for claim_id, claim in claimDict.items():
-            task_id = claim['task_id']
-            task_status = taskDict[task_id]['status']
-            if task_status in ['prepared', 'approved', 'on_hold', 'conflict', 'prescheduled']:
-                claimSize = claim['claim_size']
-                resource_id = claim['resource_id']
-                resource = resources[resource_id]
-                resourceOtherClaims = resource2otherClaims[resource_id]
-                totalOtherClaimSize = sum(c['claim_size'] for c in resourceOtherClaims)
-
-                logger.info('resource_id=%s claimSize=%s totalOtherClaimSize=%s total=%s available_capacity=%s' %
-                            (resource_id,
-                             claimSize,
-                             totalOtherClaimSize,
-                             totalOtherClaimSize + claimSize,
-                             resource['available_capacity']))
-
-                if totalOtherClaimSize + claimSize >= resource['available_capacity']:
-                    logger.info("totalOtherClaimSize (%s) + claimSize (%s) >= resource_available_capacity %s for claim %s on resource %s %s for task %s",
-                                totalOtherClaimSize, claimSize, resource['available_capacity'], claim_id, resource_id, resource['name'], task_id)
-                    newClaimStatuses[conflistStatusId].append(claim_id)
-                elif claim['status_id'] != allocatedStatusId:
-                    newClaimStatuses[claimedStatusId].append(claim_id)
+        # TODO: claim conflict computions below are incorrect
+        # they cause observations/pipelines to go to conflict, although there is ample space
+        #for claim_id, claim in claimDict.items():
+            #task_id = claim['task_id']
+            #task_status = taskDict[task_id]['status']
+            #if task_status in ['prepared', 'approved', 'on_hold', 'conflict', 'prescheduled']:
+                #claimSize = claim['claim_size']
+                #resource_id = claim['resource_id']
+                #resource = resources[resource_id]
+                #resourceOtherClaims = resource2otherClaims[resource_id]
+                #totalOtherClaimSize = sum(c['claim_size'] for c in resourceOtherClaims)
+
+                #logger.info('resource_id=%s claimSize=%s totalOtherClaimSize=%s total=%s available_capacity=%s' %
+                            #(resource_id,
+                             #claimSize,
+                             #totalOtherClaimSize,
+                             #totalOtherClaimSize + claimSize,
+                             #resource['available_capacity']))
+
+                #if totalOtherClaimSize + claimSize >= resource['available_capacity']:
+                    #logger.info("totalOtherClaimSize (%s) + claimSize (%s) >= resource_available_capacity %s for claim %s on resource %s %s for task %s",
+                                #totalOtherClaimSize, claimSize, resource['available_capacity'], claim_id, resource_id, resource['name'], task_id)
+                    #newClaimStatuses[conflistStatusId].append(claim_id)
+                #elif claim['status_id'] != allocatedStatusId:
+                    #newClaimStatuses[claimedStatusId].append(claim_id)
 
         if newClaimStatuses:
             for status_id, claim_ids in newClaimStatuses.items():