Preserving my pre-merge changes
Checkpointing