I started looking at this, but the pull request diff shows some merge conflicts.
Can you resolve these? I think what you need to do is merge from default and
resolve any merge conflicts, but someone with more experience with this (e.g.
Jendrik) might be able to give you better advice.
|