adjust benchmarks and fix incorrect rebase