update calculator
merge conflicts