Added calculator feature
Fixed merge conflict