added seeds files
merge git conflict