fixed merge flake8 errors