>>>>> Lars Magne Ingebrigtsen <larsi@gnus.org> writes:

> Can you post the twelve merge conflicts? That would make it easier to see
> whether the results are what we want...

Sure, here is the entire set of conflicts I dealt with yesterday: