Diff and merge of Jupyter Notebooks
