Revert or not to Revert?

[Gamelobby]

I have recently upgraded, but not sure which templates to revert, & which ones to just save.
I have always been told just to open the file & save it. (but there must be more to it. lol)


Here are the two options i get after an upgrade..
The attempted merge failed due to conflicts
or
Changes were automatically merged into this template

So should i revert the red ones, & save the blue ones.?

I need cliff notes. :)


Thanks