Windows <-> Linux merge