fixed conflicts from stash pop
checkpointing lots of logging