For the first time ever I've got conflicts with my custom templates after upgrading. I know I need to manually merge them, but I'm finding it all rather confusing - I decided to compare the versions and the titles don't make sense, nor can I tell which is which version.
What are the steps you go to to sort out the mess?
What are the steps you go to to sort out the mess?