Repaired TorqueDriver after GIT merge conflict problems