[git] hotfix c2
[git] hotfix c3
[git] merge hotfix c2,c3