Broken after bench update

There are merge conflicts in the code. reset the branch to HEAD and then run bench update.