fixed merge conflict for setRollerVoltage method