Resolve conflicts from benchmarking merge.