adds and tests seed
fixes merge conflicts