window2

content window2
resolved merge

resolved windows changes