resolve merge conflict

Somehow, my rebase seems not to have worked smoothly, so I created a new branch, and copied the file over.

As far as I can see, this should merge now flawlessly,

Should I close the older pull request?