correct postfixAndInfix function
Resolve merge conflict for the evaluate()