merge pep8 revert