Resolve Visual Studio conflict