ours/theirs
Cleanup and more junk
Try diff3
Status classifiers, write __version__, cleanup.