reconcile mode now works correctly