add seeds
fix conflict