fixing merge conflicts
gulp