Fixed a bug in the conflict analysis. Better names for all.

Obviously this project will never be finished. And there continue to be new issues and old issues. And yet, despite this glacial speed (remember glaciers?) we should occasionally mark progress with a new release.