Add comments to arithmtic terms code
Fix Conflict