undoing conflicts