Merge, go back to copy-if-different.