Better conflict printing
Diff 3 can handle updates
Structeured examples
SamrtDiff handles insertion