Formalize various scenarios of "conflict" in data

[slifty]

The intention of this issue is to create a table of "scenarios" of different pieces of data coming from different sources, and "ideal" resolutions for that conflict. It may be that our implementation already covers the cases, but this will make it easy for us to evaluate (and maybe eventually write tests against).

There are a few scenarios that were already written out in #1087.