win32 changes merge