Fix merge conflict in bench