simple merge conflicts in notebooks require manually editing the ipynb json #160941
Description
Locally I have an empty cell at the bottom of my notebook because I executed the last cell
When I try to merge in a change that has new cells, I get a merge conflict that requires I open the ipynb in a text editor to resolve.
