fix js conflict
Merge pull request #12 from cnnic/master

fix js conflict