stuck checkpointing
Merge conflict resolved