Botched manual merge