window 2

window2 content
window 2

window2 content
have merged

resolve conflict