4.2.1b to 4.5.0d upgrade issues

[greno]

When I performed the upgrade it gave me these errors:
Preflight Check produced:

Warning: Cannot use a scalar value as an array in
/var/www/html/crm/modules/UpgradeWizard/preflight.php on line 355

These files need manually merged:
./modules/Users/DetailView.html
./modules/Users/EditView.html
./modules/Users/ListView.html
./modules/Configurator/EditView.tpl

Commit Upgrade produced:
Warning: Cannot use a scalar value as an array in
/var/www/html/crm/modules/UpgradeWizard/commit.php on line 370

Is anything here significant? How do I manually merge the files? The files it lists have old timestamps on them which I assume are the originals. But where did it put the new ones so I can diff them?

[techex]

I see this as well.