merge kahansum

trying to solve merge conflicts