Reconciled merge