checkpoints added
merge