4.2.1 Alpha 1 Template Update failure

[Snowhog]

We updated to version 4.2.1 (from 4.2.0 PL3) and a single Mobile template is reported as an update failure: headinclude (The attempted merge failed due to conflicts).

headinclude
Default Template Updated in vBulletin 4.2.1 Alpha 1 by vBulletin Solutions
Your Custom Template Last Edited in vBulletin 4.1.9 Beta 1 by xiaoyu
The attempted merge failed due to conflicts

I don't know how to interpret this. Should I 'revert' or make changes, and if so, what changes?

Thank you.

[Lynne]

So click to view the template, then click the View History link and compare your template to the new one. Then go make any necessary changes.

[Snowhog]

There is no 'View History' link, although I can click on 'View Side by Side', which I've done. That shows me what is in the Customized Template, what "would" be in the merged template, and what the new default template would be. The conflict section is attached as a .png file. If I knew what to do, I wouldn't be asking (no offense given; it's HOT here). :)

[ForceHSS]

Do a revert on it

[Snowhog]

Done. Thank you.