fixed merge conflict while importing solvify
fixed merge conflict while importing solvify

kaushik94/sympy,aktech/sympy,souravsingh/sympy,aktech/sympy,yashsharan/sympy,souravsingh/sympy,madan96/sympy,aktech/sympy,jaimahajan1997/sympy,skidzo/sympy,kaushik94/sympy,postvakje/sympy,madan96/sympy,jaimahajan1997/sympy,chaffra/sympy,chaffra/sympy,yashsharan/sympy,skidzo/sympy,postvakje/sympy,madan96/sympy,souravsingh/sympy,yashsharan/sympy,jaimahajan1997/sympy,chaffra/sympy,postvakje/sympy,kaushik94/sympy,skidzo/sympy