Style code pythonic
Remove verbose ` is True`
Resolve conflict.