fixes merge conflict in gulpfile