fix old seeds merge conflict