I'd resolve using the parent version (that will give you the changes we made in this version) then you should re-add your custom bits, which appears to be the <xf:comment> line and the changed link.
After clicking "Resolve using parent version" the blue area that appears is clickable so you can edit it right there.
Useful information in this thread. Anyway, I prefer template modifications system for that kind of edits. You just need to check modifications after XF upgrade so that they are all still applied.
We use essential cookies to make this site work, and optional cookies to enhance your experience.