update with seed
fix conflict