Reconciled some conflicts.