Merge and update