Automerge conflicts with identical data

If two entries are seen as conflicting but the entries are exactly the
same, automatically merge the data. There is no reasonable case where
someone wants to know the writes conflicted when the value didn't.