fix botched merge