add content in windows
conflict fixed