Merging update2