merging from work