Remove nbdiff/make_merge_conflict.py -- it should be in a tools folder.
Remove nbdiff/make_merge_conflict.py -- it should be in a tools folder.

tarmstrong/nbdiff,tarmstrong/nbdiff,tarmstrong/nbdiff,tarmstrong/nbdiff