Add the enable line
Fix PEP8 E713 - test for membership should be "not in"
PyLint ignore W1111 (assignment-from-none)
Fix PEP8 E713 - test for membership should be "not in"
Add removed code from conflict fixing,
Fix PEP8 E713 - test for membership should be "not in"
Move comment so PEP8 does not complain