Commits 2f8e4347b1 and 6a32d58876 had a conflict that was undetected by source control.
2f8e4347b1
6a32d58876