solve discrepancies