Merging 2 files *only* where there are changes?

Internal error.

Oops! Looks like something went wrong!