@snuddelhund and anyone else who is having errors in Tortoise Merge with the 1.16 patch:

(Shamelessly paraphrased from atavera!)
As before, It looks like ILSpy is decompiling slightly differently for some. Here is a fix that you can try.

- Extract and save in ILSpy as in the tutorial.
- Start TortoiseMerge
- Apply Ilspy_difference-1.1.patch (from the link at the bottom of this post) as a unified diff to your project folder.
- Now apply the original patch linked from the tutorial and continue normally.

Diff Patch download link:
http://www.4shared.com/file/CUVlptUG/file.html