comment replace
resolve confict
fix task complete
Merge pull request #3 from carlchen0928/master

fix