redo last night merge