fix bug conflit
Merge pull request #81 from YanshuoH/yhuang/fix_bug_conflit

fix bug conflit