update merging