It would be good if you could fix the merge conflict as well.

—
Reply to this email directly or view it on GitHub.