change to module.exports style
merge