merge conflict of osushi.md (close #26)