sensor update
merge