Set ori to int
Conflict resolved