Reconciled conflicts.
Documentation still sparse.