If I have conflicts for both `FILE` and `file`, this will overwrite one with the other.  I think we need to sort the `Conflict`s after having coalesced the index entries into a single object.