Further conflict fixes. Indentation fixes. Issue #102