Add is_conflict column to diffs table