Merge package.js
Fix..???