reschedule
merged diary