[pypy-hg-tornado] missing conflicts