Conflicts resloved