merge-conflict

MergeNB is a VS Code extension that provides an intuitive merge conflict resolver for Jupyter notebooks, aiming to improve upon nbdime's bugginess in collaborative research settings.