merged in checkpoint