Botched merge