fixing merge issue with cli.js
no idea