Merge

Combining conflicting versions instead of dropping one, such as taking the union of two carts or keeping both notes for a person to choose.

Where the book teaches it