Fix flake8
merge