Merging changed from work computer and work computer