fixed merge issue with motor diag/tank controls