Fix bad merge from upstream (git novice in action).