pep8: remove extra empty line added when resolving merge conflict