Resloved the conflirt