Reconcile consequences of merge