Somehow that last merge conflict resolution went astray.