advcalc
merge conflict resolved