add pep8
fix conflict