Is the plugin called compare? I use Notepad++ as well.If they won't automatically merge they need to be done by hand. I use notepad++ along with a plugin for it to compare versions, plugin can be found in the plugin manager (inside plugin manager).
I've done it quite a few times so if you need help let me know.
Yes. I do have my backups for Xenbase - Flat Awesome+ - Child Style.Did you take a backup? Also did you have a child style like the installation instructions said?
Yes. I do have my backups for Xenbase - Flat Awesome+ - Child Style.