measurement data added
conflict fix