window 2

content window 2
resolve merge

resolve windows changes