Update DB schema to track conflicts as operations

**WIP - donae merge**