seed fix
merge conflicts