merge in from work laptop