common.js merge fixed