stadlerj, if you still wish us to merge these changes, can you please resolve the merge conflict first? Please when you do, also keep in mind, that since you created this Pull Request we released a contributing guide. In order for us to properly merge this pull request, it must meet the standards of the guide. Can you please adjust the new commit message[s] to match the requirements of the guide. We would at least need a header and a body for the commit, something like this:

type(scope): subject

body

Thanks