PEP8 reformat
fixed merge conflicts