resolved merge

resolved window changes