Conflicts resolved for ITSL merge