merge with windows machine