Merge Conflict: 108: .NET Standard Wants & Modernizing Win32 Apps