merge checkpoint
2 files changed