reconcile files (commit errors)