hotfix: remove committed merge conflict
hotfix: remove committed merge conflict

tscholl2/smc,DrXyzzy/smc,tscholl2/smc,sagemathinc/smc,DrXyzzy/smc,sagemathinc/smc,DrXyzzy/smc,sagemathinc/smc,tscholl2/smc,DrXyzzy/smc,sagemathinc/smc,tscholl2/smc,tscholl2/smc