nslog checkpoints
merge remote to local