windows 2

content windows 2
resolved merge

resolved windows changes