working on seed file
merge conflict resolution