Fixed merge error in MotorDemo