Solved conflict in Calculator.m