modified seed file
merge conflicts