Add windows/linux
fixed merge conflict