* run python modernize * run isort * Fix merge conflicts * Fix merge conflict--file was deleted on master