conflict resloved