added a seed
fixed merge conflicts