add list from windows
conflict changes