Get git-imerge to pass pep8 checks

pep8 was run with options `--max-line-length=99 --hang-closing`.