Since I installed ceon uri mapping, wholesale doesn't work...

Phew right answers to all of the above :hug:

Can I suggest you download the trial version of a program called Beyond Compare, it's vastly superior to the respectfully good winmerge.

Yes you copy the relevant code across from one file into the other. You will see in the Ceon files that he (Conor) clearly labels every block of code that needs to be merged into your file.
Your earlier posting actually lists the file names of those that need merging still, there were 4 off the top of my head weren't there?

You could start by posting the content of the pair of files that you are trying to merge if that helps, then I can look at it to highlight the bits you need to copy into your file. Mind you Beyond Compare also makes it very obvious too if you look at both files in that software.