DW: resolving flake8 issue caused when resolving the merge