Merging with recent update