Merge from work computer