feat(gulp): working seed
chore(merge): fix conflicts