The previous commit and e8813b296bc55a13b534bd9b2a03e1f6af366915 had merge conflicts which didn't get caught by git.