Update seeds
Resolve merge conflict