resolving conflicts that erased previous edits.
partly fixed issue #9