Amended gulp
fix merge conf