...
After clicking the Upgrade button, you will be presented with the Theme Upgrade - Check" screen. This screen gives you an opportunity to read about the changes prior to making the upgrade.
CONFLICTS
When you upgrade your theme, UltraCart does a pre-upgrade check to see if any merge conflicts are going to occur. If true, you will be presented with the following dialog:
Click Here for documentation on Handling Merge Conflicts.
TODO: Need to show the dialog that appears if there is a conflict. Then, provide a link to the topic for dealing with conflicts.