Update merging