fix merge conflicts
Merge pull request #5 from alanflorendo/seed

fix merge conflicts