ita.py updated
Conflict resolution