Reconciled merge conflicts.