add devInWindows
modified text in windows
solve the conflict