merge rage

When you have to merge two large codebases together and there are loads of conflicts to figure out.

I had to merge the upgrade story into trunk and I had so many conflicts I got major merge rage and started swearing a lot