updated seeds file
merged seeds conflict