WIP: Add support for conflict resolution in the index