[FIX] solving conflicts correctly.
Merge branch 'pylint-disable-W0622-W0222-kty' of github.com:vauxoo-dev/pylint-conf into pylint-disable-W0622-W0222-kty