Add diffutils dependency
Compute diffs for conflicts