Fix a botched merge commit