for merge
fix a stupid bug...
rebuild bundle.js