fix botched merge (+flake8)