window2

content window2
resolve merge

resolve window changes