discrepancy-resolution