Python3 compatibility.
Conflict fix.