Merge conflict
pep8 fixes