VSCode's support for ipynb merges are nonexistent, but its support for diffing jupyter notebooks is excellent. We can probably just throw up the before/after for resolved bits in a git working tree tab in vscode.
Would need to look into the API for this.