Fix update seed collection
Fix merge conflict