Make work on Win32
Resolve conflicts