This image shows the Application Upgrade Merge Conflicts dialog that lists versions of a configuration file that require manual reconciliation.