redo botched conflict resolve