Fixing merge & corrected flake8 issues