Reconciled conflicts