crash fix
Merge branch 'no_unmerged_notebook_fix' of github.com:bsplay/nbdiff into bsplay-no_unmerged_notebook_fix