Fix #196 - merging empty notebooks
Fix flake issues in merge empty notebook tests
Merge pull request #197 from tarmstrong/merge-empty-notebooks

Fix #196 - merging empty notebooks