Merge with laptop files