merging work from other computer