Merging with linux