Merge remote-tracking branch 'main/develop' into develop
handle merge error
add bind method
Merge pull request #116 from xieyu33333/develop

handle merge error