delete wrong file
Merge branch 'develop'
remove 帮助
fix conflict