Resloved conflict