merge conflict config.js
merge thing did weird space