gulp fix for merge