fixed flake8 warnings
bztotj.py: fixed conflicts