botched merge