windows 2

content windows 2
Resolve merge

Resolve windows changes