updating and merging