What to do if related documents have changed in the new release, but you need to preserve both the supplier's changes and your own modifications?