Fix botched merge