[feature] commit not finished
[feature] commit (not finished)
[feature] commit
Merge branch 'dev-commit' into dev
[fix bug] fix some bugs