Merge error in cpupower driver