Intelligently rerun `nbdev_export` in `nbdev_merge` for more automated conflict resolution

I've had a few instances now where notebook conflicts were resolved but where the modules and/or `_modidx` were still in a conflicted state. We might be able to run `nbdev_export` in the merge driver to fix that. I haven't yet thought about how complicated the logic would need to be.