checkpoint progress...
merging
added checkpoint changes