sdf
Fixed merges and updated the gulpfile