switched to Gulp
merge