A merge and update so we can update the npm package