It already is in master, I suspect that is why the merge fails.