pushing all windows change to merge with mac
fxing conflict