I resolved the conflicts and pushed the PR manually to master:
I'm sorry the PR stalled, feel free to ping next time a PR gets stuck.
Pull-Request has been closed by jhrozek