resolve conflict
fix conflict
Merge pull request #2 from charlesyao/dev

Fix Conflict