Conflicts: Core/Core.vcxproj Windows/PPSSPP.vcxproj native
Just open the MSVC project file and build.