merging with laptop
merged
working Te