including resolved and discrepancy for unit