merge in reconciled repo