fix apparent bad merge
add script to cleanup pylint output
cannot fix short of changing the parameter name