Fixing accidental overwrite of super_to_choi.py caused by autopep8
Attempting to resolve conflict
More pep8-related conflicts