Bug fix and Pylint detection improvement
Fixed merge conflict