Fixed:
    fixed the bugs when commit
Fixed:
    fixed the bugs when commit
Merge remote-tracking branch 'origin/master'