update seed file
merge conflicts