Merge from update