renaming as merge conflict broke browserify config