Change Calculator
Resolve conflict Calculator
Add comments for custom exception
Add some tests