Reconciled errors when merging