navbar - The attempted merge failed

[jdirty]

Just upgraded from 416 to 417, only have arcade installed. Upgrade went ok, but I have a problem with "Default Style - navbar - The attempted merge failed due to conflicts"

I have 3 options:

[Edit Template]
[View Highlighted Changes]
[Revert]

The highlighted changes link shows me a line of code belonging to the arcade.. not really sure what to do from here.

any suggestions?

[HMBeaty]

You need to:

Make a copy of the change
Revert your navbar template
Reapply the change

[jdirty]

thanks, fixed!