Merge 1 windows

merge on windows