merged conservation into develop, ran win32 tests