sensordata merge fail fixed