merged add and update