merge conflict
Search
* gene - hst-3.2
* fix #839