Update database to store confliction *operatioons*, not diffs
Update code which touches retcon_diff_conflicts table
Make those changes more lens-y
Add is_conflict column to diffs table
Merge pull request #81 from anchor/wip-api-db-changes

Update DB schema to track conflicts as operations