Update calc.y

new code without any conflicts