Issue with gulp-if / replaced with merge

[thetwit4u]

There is an issue with gulp-if (robrich/gulp-if#43) and it popped up in this project.
So the best solution is replace the gulp-if with a clone/merge (already used in the project).

[popzip]

Thanks for the contribution @vanheeswijck we will take a look.

Also FYI please see contributing guidelines:
Before we can accept your pull request, you need to sign the Contributor
License Agreement.

[popzip]

Thanks @vanheeswijck for the CLA. We've got several improvements in progress including some code to address the issue you've highlighted here. We will let you know if we need anything else from you in order to fix it.