poof. Conflict gone
second chapter
less convoluted text