RobotSensors

fixed merging errors