Merge branch 'develop'
- repair git
repair the conflict problems