Oops this is why I should triple-check my commits before pushing.  Somehow didn't stage my merge.