resolve file discrepancies