I'm fine with merging. Just solved the merge conflict.
If nobody beats me by time or with feedback, I'll merge this on Sunday.

—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub, or mute the thread.