Restoring changes overwritten during the merge.