Cool! Well, it's just a merge conflict. I don't knoe how to combine the patches. Should be pretty easy for someone that does not need to google for every line of C.
I can give you notes* later on what to do to get to the conflict, then maybe you can resolve it and push the result to some repo? :)
*Just 3 or 4 commands, I think, including the Debian gbp command
Do you get fined if you are unlucky to have no harvest and cannot bring anything back?