I fixed it in the merge commit.