... if we don't find a better way, I can pull this branch and do the conflict resolution. At least I know this part of the code ...