This image shows the Merge Log File created during the upgrade process to indicate files that need to be checked and reconciled manually.