from gulp-browserify to browserify + begin of set
merge conflict