window 2

content window 2
resolved merge

resolved windows changes