Fix wrong merging of setup.py
Fix wrong merging of setup.py

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