fix merge.js