Merge from office