Fixed a conflict and streamlined the cgate simplification
Fixed a conflict and streamlined the cgate simplification

Fixed a conflict that should have been caught before.

Streamlined the cgate simplification process. Now, if you form a 2Q
gate by calling CGate(), it by default does not simplify the gate.
However, if you call CNOT or CPHASE, it does simplify the gate. I
believe this is the desired behavior.

asm666/sympy,abloomston/sympy,atsao72/sympy,toolforger/sympy,rahuldan/sympy,Sumith1896/sympy,sahilshekhawat/sympy,lidavidm/sympy,beni55/sympy,Vishluck/sympy,toolforger/sympy,garvitr/sympy,pbrady/sympy,VaibhavAgarwalVA/sympy,farhaanbukhsh/sympy,garvitr/sympy,farhaanbukhsh/sympy,emon10005/sympy,Arafatk/sympy,jbbskinny/sympy,asm666/sympy,drufat/sympy,moble/sympy,beni55/sympy,sampadsaha5/sympy,drufat/sympy,wyom/sympy,sahmed95/sympy,asm666/sympy,Shaswat27/sympy,jaimahajan1997/sympy,lidavidm/sympy,kaichogami/sympy,atsao72/sympy,garvitr/sympy,saurabhjn76/sympy,jaimahajan1997/sympy,meghana1995/sympy,oliverlee/sympy,saurabhjn76/sympy,AunShiLord/sympy,ChristinaZografou/sympy,jerli/sympy,mcdaniel67/sympy,jerli/sympy,Vishluck/sympy,grevutiu-gabriel/sympy,wyom/sympy,kevalds51/sympy,mafiya69/sympy,cccfran/sympy,madan96/sympy,yukoba/sympy,iamutkarshtiwari/sympy,jaimahajan1997/sympy,Designist/sympy,dqnykamp/sympy,skidzo/sympy,Gadal/sympy,ahhda/sympy,yashsharan/sympy,VaibhavAgarwalVA/sympy,bukzor/sympy,MechCoder/sympy,lindsayad/sympy,Titan-C/sympy,atreyv/sympy,Shaswat27/sympy,Curious72/sympy,yukoba/sympy,pandeyadarsh/sympy,yukoba/sympy,sahmed95/sympy,jamesblunt/sympy,maniteja123/sympy,abhiii5459/sympy,AunShiLord/sympy,MridulS/sympy,vipulroxx/sympy,liangjiaxing/sympy,lindsayad/sympy,jerli/sympy,liangjiaxing/sympy,debugger22/sympy,AkademieOlympia/sympy,kaichogami/sympy,abloomston/sympy,postvakje/sympy,saurabhjn76/sympy,shipci/sympy,mafiya69/sympy,atreyv/sympy,kaushik94/sympy,ga7g08/sympy,mcdaniel67/sympy,ahhda/sympy,shikil/sympy,atreyv/sympy,hrashk/sympy,drufat/sympy,dqnykamp/sympy,sahilshekhawat/sympy,debugger22/sympy,sahilshekhawat/sympy,Sumith1896/sympy,Gadal/sympy,AkademieOlympia/sympy,kmacinnis/sympy,abhiii5459/sympy,Titan-C/sympy,sahmed95/sympy,Mitchkoens/sympy,shikil/sympy,Curious72/sympy,Davidjohnwilson/sympy,ChristinaZografou/sympy,lindsayad/sympy,cccfran/sympy,Designist/sympy,shikil/sympy,maniteja123/sympy,sampadsaha5/sympy,wanglongqi/sympy,Davidjohnwilson/sympy,MechCoder/sympy,kumarkrishna/sympy,madan96/sympy,jbbskinny/sympy,sunny94/temp,pandeyadarsh/sympy,kumarkrishna/sympy,hargup/sympy,Gadal/sympy,iamutkarshtiwari/sympy,Shaswat27/sympy,abhiii5459/sympy,farhaanbukhsh/sympy,Arafatk/sympy,grevutiu-gabriel/sympy,debugger22/sympy,Mitchkoens/sympy,yashsharan/sympy,hargup/sympy,souravsingh/sympy,pbrady/sympy,sunny94/temp,kaushik94/sympy,MechCoder/sympy,MridulS/sympy,aktech/sympy,VaibhavAgarwalVA/sympy,shipci/sympy,hrashk/sympy,skirpichev/omg,atsao72/sympy,kaichogami/sympy,iamutkarshtiwari/sympy,Sumith1896/sympy,kmacinnis/sympy,moble/sympy,Vishluck/sympy,toolforger/sympy,Davidjohnwilson/sympy,cswiercz/sympy,kevalds51/sympy,chaffra/sympy,wyom/sympy,vipulroxx/sympy,meghana1995/sympy,souravsingh/sympy,AunShiLord/sympy,bukzor/sympy,abloomston/sympy,rahuldan/sympy,ga7g08/sympy,wanglongqi/sympy,rahuldan/sympy,pbrady/sympy,Titan-C/sympy,Arafatk/sympy,mafiya69/sympy,diofant/diofant,AkademieOlympia/sympy,oliverlee/sympy,dqnykamp/sympy,lidavidm/sympy,postvakje/sympy,aktech/sympy,hargup/sympy,mcdaniel67/sympy,Mitchkoens/sympy,kumarkrishna/sympy,chaffra/sympy,jbbskinny/sympy,souravsingh/sympy,grevutiu-gabriel/sympy,sunny94/temp,maniteja123/sympy,hrashk/sympy,skidzo/sympy,pandeyadarsh/sympy,ga7g08/sympy,cccfran/sympy,ChristinaZografou/sympy,kevalds51/sympy,beni55/sympy,meghana1995/sympy,ahhda/sympy,cswiercz/sympy,emon10005/sympy,jamesblunt/sympy,wanglongqi/sympy,oliverlee/sympy,MridulS/sympy,skidzo/sympy,vipulroxx/sympy,aktech/sympy,chaffra/sympy,cswiercz/sympy,sampadsaha5/sympy,Designist/sympy,moble/sympy,madan96/sympy,kaushik94/sympy,postvakje/sympy,kmacinnis/sympy,bukzor/sympy,jamesblunt/sympy,shipci/sympy,Curious72/sympy,liangjiaxing/sympy,emon10005/sympy,yashsharan/sympy