merge and update