checkpoint, before merge