Switched to storing the indices for all items in an ordered set.  This gives consistent ordering in a conflict.