renamed state -> ket and adjoint -> bra because it makes more sense
merging