calc changes
merge conflict