updating Windows version
merging...