Correct merge conflict where composite didn't get converted to new gulp format