[rdiddly]

In a merge conflict versions A & B would tend to be different changes made to the original, usually made by different people.