Notebooks should gracefully handle merge conflicts

When git automatically inserts HEAD and BRANCH merge conflicts, a user cannot open the notebook and it can be difficult to fix the merge conflicts within the raw dot ipynb file.

Would it be possible to parse the ipynb file and create a way to resolve the merge conflict within the notebook interface?

Update: Maybe partially covered in this enhancement proposal.
https://github.com/jupyter/enhancement-proposals/pull/8/files/71b2467c70cdf01b0baa3a0c24fadacd00db9a7f

Start by reviewing how Jupyter Notebook opens .ipynb files and the linked enhancement proposal, especially its discussion of merge conflicts. Define how conflicts marked with HEAD and BRANCH should be represented in the notebook interface and what resolving them should produce in the raw .ipynb file.

Written by the indexing model from the issue text.