make conflic from window github

make conflic from window github
Revert "make conflic from window github"

This reverts commit 02363ff0a9a44395aa23f8a45e5381ed6812f9d7.