fix merge conflicts
Merge pull request #7 from toannguyenle/toan

fix merge conflicts