merge with linux