reconcile bug after re-reconcile