grunt to gulp
fix conflict