windows 2

content
resolved merge

window changes