kvm: janitorial: remove leftovers from merge conflict