anchor/retcon — pull request #81 by thsutton (2014-10-20 02:02:42+00:00)
Title: Update DB schema to track conflicts as operations

**WIP - donae merge**