corrected minor merge error
corrected minor merge error

dartsim/dart,dartsim/dart,axeisghost/DART6motionBlur,dartsim/dart,axeisghost/DART6motionBlur,axeisghost/DART6motionBlur,dartsim/dart,dartsim/dart