Fix confilct
Merge pull request #6 from nguyen-kiet-mulodo/v1.0.fixbug

Fix confilct