fixed merge conflict that made it into the repository, and prevented installation due to syntax errors
fixed merge conflict that made it into the repository, and prevented installation due to syntax errors

cgranade/qutip,anubhavvardhan/qutip,qutip/qutip,cgranade/qutip,anubhavvardhan/qutip,zasdfgbnm/qutip,qutip/qutip,zasdfgbnm/qutip