Ajit,Ravi| resolved conflicts from ivy.xml