fundamental operation that reconciles the changes made to two independent branches of a file into a single set of files that contains both sets of changes